diff --git a/classes/Module.php b/classes/Module.php
index f2c9a797b..02d6088f6 100644
--- a/classes/Module.php
+++ b/classes/Module.php
@@ -714,7 +714,7 @@ abstract class ModuleCore
 			if (is_dir(_PS_MODULE_DIR_.$name) && Tools::file_exists_cache(_PS_MODULE_DIR_.$name.'/'.$name.'.php'))
 			{
 				if (!Validate::isModuleName($name))
-					die(Tools::displayError().' (Module '.$name.')');
+					throw new PrestashopException(sprintf('Module %s is not a valid module name', $name));
 				$moduleList[] = $name;
 			}
 		}