diff --git a/app/webroot/index.php b/app/webroot/index.php
index 8d4ecdb23..4b681e3b1 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -74,7 +74,9 @@
 			  define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 		 }
 	}
-	require CORE_PATH . 'cake' . DS . 'bootstrap.php';
+	if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
+		trigger_error("Can't find CakePHP core.  Check the value of CAKE_CORE_INCLUDE_PATH in app/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory." , E_USER_ERROR);
+	}
 	if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
 	} else {
 		 $Dispatcher=new Dispatcher();
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index 5bc550d42..2986c3d19 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -231,7 +231,7 @@ class AuthComponent extends Object {
  * @return void
  */
 	function startup(&$controller) {
-		if (low($controller->name) == 'app' || (low($controller->name) == 'tests' && DEBUG > 0)) {
+		if (low($controller->name) == 'app' || (low($controller->name) == 'tests' && Configure::read() > 0)) {
 			return;
 		}
 		if (!$this->_setDefaults()) {