diff --git a/web/index.php b/web/index.php
index b0a1bfb6e..c248dc7fc 100644
--- a/web/index.php
+++ b/web/index.php
@@ -103,6 +103,7 @@ if ( isset( $_REQUEST['request'] ) )
 {
     foreach ( getSkinIncludes( 'ajax/'.$_REQUEST['request'].'.php', true, true ) as $includeFile )
         require_once $includeFile;
+    return;
 }
 else
 {
@@ -111,7 +112,7 @@ else
         foreach ( $includeFiles as $includeFile )
             require_once $includeFile;
     }
-    else
+    if ( !$includeFiles || $_REQUEST['view'] == 'error' )
     {
         foreach ( getSkinIncludes( 'views/error.php', true, true ) as $includeFile )
             require_once $includeFile;