diff --git a/index.php b/index.php
index 7d1eede462..5c16d2fd50 100644
--- a/index.php
+++ b/index.php
@@ -52,8 +52,9 @@ if (file_exists($actionfile)) {
 		}
 		$config['db']['database'] = $mirror;
 	}
-    call_user_func(array($action_obj, 'init'), $_REQUEST);
-    call_user_func(array($action_obj, 'handle'), $_REQUEST);
+    if (call_user_func(array($action_obj, 'init'), $_REQUEST)) {
+		call_user_func(array($action_obj, 'handle'), $_REQUEST);
+	}
 } else {
     common_user_error(_('Unknown action'));
 }
\ No newline at end of file
diff --git a/lib/action.php b/lib/action.php
index ba4fc71fb6..895a0d48c4 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -30,6 +30,7 @@ class Action { // lawsuit
 	
 	function init($argarray) {
 		$this->args =& common_copy_args($argarray);
+		return true;
 	}
 
 	# For comparison with If-Last-Modified