From c6cdd7659c06e9a029838e65a97f02481aa66485 Mon Sep 17 00:00:00 2001
From: David Snopek <dsnopek@gmail.com>
Date: Mon, 6 Nov 2017 16:46:00 -0600
Subject: [PATCH] Check that Drupal 8 has been bootstrapped

---
 CRM/Utils/Hook/Drupal8.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Utils/Hook/Drupal8.php b/CRM/Utils/Hook/Drupal8.php
index de0d8c4e77..817df956dd 100644
--- a/CRM/Utils/Hook/Drupal8.php
+++ b/CRM/Utils/Hook/Drupal8.php
@@ -36,7 +36,7 @@ class CRM_Utils_Hook_Drupal8 extends CRM_Utils_Hook_DrupalBase {
    * {@inheritdoc}
    */
   protected function getDrupalModules() {
-    if (class_exists('\Drupal')) {
+    if (class_exists('\Drupal') && \Drupal::hasContainer()) {
       return array_keys(\Drupal::moduleHandler()->getModuleList());
     }
   }
-- 
2.25.1