diff --git a/amp.install b/amp.install
index 1fa3bb9..7f162de 100644
--- a/amp.install
+++ b/amp.install
@@ -14,6 +14,7 @@ function amp_requirements($phase) {
     if (!class_exists('\Lullabot\AMP\AMP')) {
       $requirements['amp_library'] = array(
         'title' => t('AMP'),
+        'value' => t('Not available'),
         'description' => t('The AMP module requires the PHP <a href="@library">AMP library</a>. Install using <a href="@composer_manager">composer manager</a>',
             array('@library' => 'https://github.com/Lullabot/amp-library', '@composer_manager' => 'https://www.drupal.org/project/composer_manager')),
         'severity' => REQUIREMENT_ERROR,
@@ -23,6 +24,7 @@ function amp_requirements($phase) {
     if (empty($themes['amptheme']) || empty($themes['amptheme']->status)) {
       $requirements['amptheme'] = array(
         'title' => t('AMP Base Theme'),
+        'value' => t('Not installed'),
         'description' => t('The AMP module requires the <a href="@theme">AMP Base Theme</a> to be installed.', array('@theme' => 'https://www.drupal.org/project/amptheme')),
         'severity' => REQUIREMENT_ERROR,
       );
diff --git a/amp.module b/amp.module
index 112ee64..4e27a30 100644
--- a/amp.module
+++ b/amp.module
@@ -305,6 +305,14 @@ function amp_entity_info_alter(&$entity_info) {
  * Determines whether a request should return AMP HTML.
  */
 function amp_is_amp_request() {
+  $result = &drupal_static(__FUNCTION__);
+
+  if (!isset($result)) {
+    $result = isset($_GET['amp']);
+
+    $node = menu_get_object();
+
+  }
 
   // Get current path.
   $path = current_path();