diff --git a/index.php b/index.php
index 5da9d3cc160..416fa17a6b2 100644
--- a/index.php
+++ b/index.php
@@ -3,24 +3,23 @@
 
 include_once "includes/common.inc";
 
-if (isset($_GET["q"])) {
+if (!empty($_GET["q"])) {
   if (module_exist("node") && $path = node_get_alias($_GET["q"])) {
     $_GET["q"] = $path;
   }
-   $mod = arg(0);
 }
 else {
   $_GET["q"] = variable_get("site_frontpage", "node");
-  $mod = arg(0);
 }
 
+$mod = arg(0);
+
+drupal_page_header();
+
 if (isset($mod) && module_hook($mod, "page")) {
-  drupal_page_header();
   module_invoke($mod, "page");
-  drupal_page_footer();
 }
 else {
-  drupal_page_header();
   check_php_setting("magic_quotes_gpc", 0);
 
   if (module_hook(variable_get("site_frontpage", "node"), "page")) {
@@ -30,7 +29,8 @@ else {
     theme("header");
     theme("footer");
   }
-  drupal_page_footer();
 }
 
+drupal_page_footer();
+
 ?>