diff --git a/Moor.php b/Moor.php
index 3b6c112..46b3e5e 100644
--- a/Moor.php
+++ b/Moor.php
@@ -205,11 +205,9 @@ public static function linkTo($key) {
 		}
 
 		if (!isset(self::$cache->link_to[$key])) {
-			
 			//self::$cache_for_linkTo[$key] = FALSE;
-
 			$best_route = NULL;
-			$param_names = preg_split('/(?<=[^:])(\s*:)(?!:)/', $callback_string);
+			$param_names = preg_split('/(\s+:)|(\s+)|((?<=[^:]):(?!:))/', $callback_string);
 			$callback_string = array_shift($param_names);
 			$param_names_flipped = array_flip($param_names);
 			$callback_params = array();
@@ -590,7 +588,7 @@ public static function triggerContinue() {
 	 * @return void
 	 */
 	public static function triggerNotFound() {
-		throw new NotFoundException();
+		throw new MoorNotFoundException();
 	}
 
 	// ===============