From 22c810a782048a182b5b9f989386bad5edbfad1c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 22 May 2013 21:06:48 -0400
Subject: [PATCH] CRM-12683 - Fix NPE when an extension container disappears

----------------------------------------
* CRM-12683: Load extensions in "vendor" directory
  http://issues.civicrm.org/jira/browse/CRM-12683
---
 CRM/Extension/Container/Collection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Extension/Container/Collection.php b/CRM/Extension/Container/Collection.php
index ed29e76530..07a2b8ccb1 100644
--- a/CRM/Extension/Container/Collection.php
+++ b/CRM/Extension/Container/Collection.php
@@ -129,7 +129,7 @@ class CRM_Extension_Container_Collection implements CRM_Extension_Container_Inte
    */
   public function getContainer($key) {
     $k2c = $this->getKeysToContainer();
-    if (isset($k2c[$key])) {
+    if (isset($k2c[$key]) && isset($this->containers[$k2c[$key]])) {
       return $this->containers[$k2c[$key]];
     } else {
       throw new CRM_Extension_Exception_MissingException("Unknown extension: $key");
-- 
2.25.1