diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 5d383ef64..7aacb3042 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -318,10 +318,13 @@ class AdminModulesControllerCore extends AdminController
 		//check if it's a real module
 		foreach($zip_folders as $folder)
 			if (!in_array($folder, array('.', '..', '.svn', '.git', '__MACOSX')) && !Module::getInstanceByName($folder))
+			{
 				$this->errors[] = Tools::displayError('The module '.$folder.' you uploaded is not a module');
-
+				$this->recursiveDeleteOnDisk(_PS_MODULE_DIR_.$folder);
+			}
+			
 		@unlink($file);
-		@unlink($tmp_folder);
+		$this->recursiveDeleteOnDisk($tmp_folder);
 		if (!count($this->errors) && $success && $redirect)
 			Tools::redirectAdmin(self::$currentIndex.'&conf=8'.'&token='.$this->token);
 	}