diff -u b/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
--- b/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2455,7 +2455,10 @@
   if (isset($new_container)) {
     $container = $new_container;
   }
-  return $container ?: FALSE;
+  if ($container) {
+    return $container;
+  }
+  return FALSE;
 }
 
 /**