diff --git a/bootstrap.theme b/bootstrap.theme
index c2d8e02..3ebb302 100644
--- a/bootstrap.theme
+++ b/bootstrap.theme
@@ -1019,7 +1019,7 @@ function bootstrap_preprocess_menu_link(&$variables) {
   }
  // Issue #1896674 - On primary navigation menu, class 'active' is not set on active menu item.
  // @see http://drupal.org/node/1896674
- if (($element['#href'] == $_GET['q'] || ($element['#href'] == '<front>' && drupal_is_front_page())) && (empty($element['#localized_options']['language']) || $element['#localized_options']['language']->language == $language_url->language)) {
+ if (((isset($_GET['q']) && $element['#href'] == $_GET['q']) || ($element['#href'] == '<front>' && drupal_is_front_page())) && (empty($element['#localized_options']['language']) || $element['#localized_options']['language']->language == $language_url->language)) {
    $element['#attributes']['class'][] = 'active';
  }
   $output = l($element['#title'], $element['#href'], $element['#localized_options']);
diff --git a/templates/page.html.twig b/templates/page.html.twig
index 00d7b50..6a487be 100644
--- a/templates/page.html.twig
+++ b/templates/page.html.twig
@@ -1,3 +1,4 @@
+<pre>{{ dump() }}</pre>
 <header id="navbar" role="banner" class="navbar navbar-static-top">
   <div class="navbar-inner">
     <div class="container">