diff --git a/main.php b/main.php
index 283d9efb8..da5267c0a 100644
--- a/main.php
+++ b/main.php
@@ -43,6 +43,16 @@ foreach($envFiles as $envFile) {
         }
 }
 
+if(isset($_GET['url'])) {
+	$url = $_GET['url'];
+	
+// Lighttpd uses this
+} else {
+	list($url, $query) = explode('?', $_SERVER['REQUEST_URI'], 2);
+	parse_str($query, $_GET);
+	if($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
+}
+
 if(ManifestBuilder::staleManifest()){
 	ManifestBuilder::compileManifest();
 }
@@ -83,15 +93,7 @@ if(isset($_GET['debug_profile'])) Profiler::unmark('DB::connect');
 // Get the request URL
 $baseURL = dirname(dirname($_SERVER['SCRIPT_NAME']));
 
-if(isset($_GET['url'])) {
-	$url = $_GET['url'];
-	
-// Lighttpd uses this
-} else {
-	list($url, $query) = explode('?', $_SERVER['REQUEST_URI'], 2);
-	parse_str($query, $_GET);
-	if($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
-}
+
 
 if(substr($url,0,strlen($baseURL)) == $baseURL) $url = substr($url,strlen($baseURL));