diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php
index f7395bf..e3f267b 100644
--- a/src/Pecee/SimpleRouter/RouterBase.php
+++ b/src/Pecee/SimpleRouter/RouterBase.php
@@ -204,13 +204,16 @@ class RouterBase {
                 }
             }
 
-            if($newRequest === null && $this->csrfVerifier !== null) {
+            if($newRequest === null) {
 
                 // Loop through each route-request
                 $this->processRoutes($this->routes);
 
-                // Verify csrf token for request
-                $this->csrfVerifier->handle($this->request);
+                if($this->csrfVerifier !== null) {
+
+                    // Verify csrf token for request
+                    $this->csrfVerifier->handle($this->request);
+                }
             }
 
             $request = ($newRequest !== null) ? $newRequest : $request;
diff --git a/test/Dummy/DummyMiddleware.php b/test/Dummy/DummyMiddleware.php
index 5dd9d68..1cd4507 100644
--- a/test/Dummy/DummyMiddleware.php
+++ b/test/Dummy/DummyMiddleware.php
@@ -7,7 +7,7 @@ use Pecee\Http\Request;
 
 class DummyMiddleware implements IMiddleware {
 
-    public function handle(Request $request) {
+    public function handle(Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null) {
        throw new MiddlewareLoadedException('Middleware loaded!');
     }
 
diff --git a/test/Dummy/Handler/ExceptionHandler.php b/test/Dummy/Handler/ExceptionHandler.php
index 5b415ef..82e366c 100644
--- a/test/Dummy/Handler/ExceptionHandler.php
+++ b/test/Dummy/Handler/ExceptionHandler.php
@@ -1,7 +1,7 @@
 <?php
 class ExceptionHandler implements \Pecee\Handler\IExceptionHandler {
 
-    public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry $router = null, \Exception $error){
+    public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null, \Exception $error){
         throw $error;
     }
 
diff --git a/test/GroupTest.php b/test/GroupTest.php
index f467454..4ed2415 100644
--- a/test/GroupTest.php
+++ b/test/GroupTest.php
@@ -7,7 +7,7 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
 
     protected $result;
 
-    public function testGroup() {
+    public function testGroupLoad() {
 
         $this->result = false;
 
@@ -18,7 +18,7 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
         try {
             \Pecee\SimpleRouter\SimpleRouter::start();
         } catch(Exception $e) {
-
+            echo $e->getMessage();
         }
 
         $this->assertTrue($this->result);