diff --git a/datamodels/2.x/itop-core-update/src/Service/RunTimeEnvironmentCoreUpdater.php b/datamodels/2.x/itop-core-update/src/Service/RunTimeEnvironmentCoreUpdater.php
index 6715878e0..5164e428a 100644
--- a/datamodels/2.x/itop-core-update/src/Service/RunTimeEnvironmentCoreUpdater.php
+++ b/datamodels/2.x/itop-core-update/src/Service/RunTimeEnvironmentCoreUpdater.php
@@ -138,19 +138,7 @@ class RunTimeEnvironmentCoreUpdater extends RunTimeEnvironment
 		{
 			throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)");
 		}
-		$aDirsToCompile = array($sSourceDirFull);
-		if (is_dir(APPROOT.'extensions'))
-		{
-			$aDirsToCompile[] = APPROOT.'extensions';
-		}
-		$sExtraDir = APPROOT.'data/'.$this->sTargetEnv.'-modules/';
-		if (is_dir($sExtraDir))
-		{
-			$aDirsToCompile[] = $sExtraDir;
-		}
-
-		$aExtraDirs = $this->GetExtraDirsToScan($aDirsToCompile);
-		$aDirsToCompile = array_merge($aDirsToCompile, $aExtraDirs);
+		$aDirsToCompile = [$sSourceDirFull];
 
 		$oFactory = new ModelFactory($aDirsToCompile);
 		$aModules = $oFactory->FindModules();
diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index 4daeedbdd..123e5cca3 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -944,9 +944,9 @@ class ModelFactory
 			$aLoadedModuleNames = array();
 			foreach (self::$aLoadedModules as $oModule)
 			{
-				$aLoadedModuleNames[] = $oModule->GetName();
+				$aLoadedModuleNames[] = $oModule->GetName().':'.$oModule->GetVersion();
 			}
-			throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(',',
+			throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(', ',
 					$aLoadedModuleNames));
 		}
 	}