diff --git a/application/bundle.php b/application/bundle.php
index f9b925c9..368531bc 100644
--- a/application/bundle.php
+++ b/application/bundle.php
@@ -37,6 +37,5 @@
 */
 
 Autoloader::map(array(
-	//'User' => path('app').'models/user.php',
-	//'Role' => path('app').'models/role.php',
+	'Base_Controller' => path('app').'controllers/base.php',
 ));
\ No newline at end of file
diff --git a/application/controllers/base.php b/application/controllers/base.php
new file mode 100644
index 00000000..177d887a
--- /dev/null
+++ b/application/controllers/base.php
@@ -0,0 +1,17 @@
+<?php
+
+class Base_Controller extends Controller {
+
+	/**
+	 * Catch-all method for requests that can't be matched.
+	 *
+	 * @param  string    $method
+	 * @param  array     $parameters
+	 * @return Response
+	 */
+	public function __call($method, $parameters)
+	{
+		return Response::error('404');
+	}
+
+}
\ No newline at end of file
diff --git a/application/controllers/home.php b/application/controllers/home.php
index 3f442005..e09f48b8 100644
--- a/application/controllers/home.php
+++ b/application/controllers/home.php
@@ -1,6 +1,6 @@
 <?php
 
-class Home_Controller extends Controller {
+class Home_Controller extends Base_Controller {
 
 	/*
 	|--------------------------------------------------------------------------