diff --git a/AltoRouter.php b/AltoRouter.php
index 8103dd3..9f7a82e 100644
--- a/AltoRouter.php
+++ b/AltoRouter.php
@@ -99,8 +99,8 @@ class AltoRouter {
 		}
 
 		// Strip query string (?a=b) from Request Url
-		if (false !== strpos($requestUrl, '?')) {
-			$requestUrl = strstr($requestUrl, '?', true);
+		if (($strpos = strpos($requestUrl, '?')) !== false) {
+			$requestUrl = substr($requestUrl, $strpos +1);
 		}
 
 		// set Request Method if it isn't passed as a parameter
diff --git a/index.php b/index.php
index e8c6ab4..c8458e6 100644
--- a/index.php
+++ b/index.php
@@ -3,11 +3,13 @@
 require 'AltoRouter.php';
 
 $router = new AltoRouter();
-$router->setBasePath('/AltoRouter');
+$router->setBasePath('/php-projects/AltoRouter');
 $router->map('GET|POST','/', 'home#index', 'home');
 $router->map('GET','/users/', array('c' => 'UserController', 'a' => 'ListAction'));
 $router->map('GET','/users/[i:id]', 'users#show', 'users_show');
 $router->map('POST','/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do');
+$router->map('GET','/error/', 'whatever');
+$router->map('GET','/error/[i:code]/', 'whatever');
 
 // match current request
 $match = $router->match();