diff --git a/app/webroot/index.php b/app/webroot/index.php
index 35ebed025..719f172c4 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -76,5 +76,5 @@
 	} else {
 		require LIBS . 'dispatcher.php';
 		$Dispatcher = new Dispatcher();
-		$Dispatcher->dispatch(new CakeRequest($_GET['url']));
+		$Dispatcher->dispatch(new CakeRequest(isset($_GET['url']) ? $_GET['url'] : null));
 	}
diff --git a/cake/console/templates/skel/webroot/index.php b/cake/console/templates/skel/webroot/index.php
index 35ebed025..719f172c4 100644
--- a/cake/console/templates/skel/webroot/index.php
+++ b/cake/console/templates/skel/webroot/index.php
@@ -76,5 +76,5 @@
 	} else {
 		require LIBS . 'dispatcher.php';
 		$Dispatcher = new Dispatcher();
-		$Dispatcher->dispatch(new CakeRequest($_GET['url']));
+		$Dispatcher->dispatch(new CakeRequest(isset($_GET['url']) ? $_GET['url'] : null));
 	}
diff --git a/index.php b/index.php
index 860f61d02..cb0352b8a 100644
--- a/index.php
+++ b/index.php
@@ -41,15 +41,7 @@
 /**
  * Set the include path or define app and core path
  */
-	if (function_exists('ini_set')) {
-		ini_set('include_path',
-			ini_get('include_path') . PATH_SEPARATOR . CAKE_CORE_INCLUDE_PATH
-			. PATH_SEPARATOR . ROOT . DS . APP_DIR . DS
-		);
-		define('APP_PATH', null);
-		define('CORE_PATH', null);
-	} else {
-		define('APP_PATH', ROOT . DS . APP_DIR . DS);
-		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-	}
+	define('APP_PATH', ROOT . DS . APP_DIR . DS);
+	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+
 	require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php';