diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php
index e2d9091eb8..3012231636 100644
--- a/setup/extensionsmap.class.inc.php
+++ b/setup/extensionsmap.class.inc.php
@@ -575,7 +575,12 @@ class iTopExtensionsMap
 	 */
 	public function LoadChoicesFromDatabase(Config $oConfig)
 	{
-		foreach ($this->LoadInstalledExtensionsFromDatabase($oConfig) as $oExtension) {
+		$aLoadInstalledExtensionsFromDatabase = $this->LoadInstalledExtensionsFromDatabase($oConfig);
+		if (false === $aLoadInstalledExtensionsFromDatabase) {
+			return false;
+		}
+
+		foreach ($aLoadInstalledExtensionsFromDatabase as $oExtension) {
 			$this->MarkAsChosen($oExtension->sCode);
 			$this->SetInstalledVersion($oExtension->sCode, $oExtension->sVersion);
 		}
diff --git a/setup/feature_removal/DryRemovalRuntimeEnvironment.php b/setup/feature_removal/DryRemovalRuntimeEnvironment.php
index 494598d731..d7f362db8f 100644
--- a/setup/feature_removal/DryRemovalRuntimeEnvironment.php
+++ b/setup/feature_removal/DryRemovalRuntimeEnvironment.php
@@ -55,7 +55,7 @@ class DryRemovalRuntimeEnvironment extends RunTimeEnvironment
 
 		foreach ($aExtensionCodes as $sCode) {
 			/** @var \iTopExtension $oExtension */
-			$oExtension = $oExtensionsMap->Get($sCode);
+			$oExtension = $oExtensionsMap->GetFromExtensionCode($sCode);
 			if (!is_null($oExtension)) {
 				$sDir = $oExtension->sSourceDir;
 				\IssueLog::Info(__METHOD__.": remove extension locally", null, [$oExtension->sCode => $sDir]);