diff --git a/classes/Tools.php b/classes/Tools.php
index d73875339..ad33b4e23 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -669,8 +669,7 @@ class ToolsCore
 	public static function deleteDirectory($dirname, $delete_self = true)
 	{
 		$dirname = rtrim($dirname, '/').'/';
-		$files = scandir($dirname);
-		if (is_dir($dirname))
+		if ($files = scandir($dirname))
 		{
 			foreach ($files as $file)
 			if ($file != '.' && $file != '..' && $file != '.svn')
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index aa91f2172..7bb566cd1 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -655,9 +655,8 @@ class AdminTranslationsControllerCore extends AdminController
 						elseif (!preg_match('@^[0-9a-z-_/\\\\]+\.(html|tpl|txt)$@i', $file2check['filename']))
 							$this->errors[] = sprintf(Tools::displayError('Unidentified file found: %s'), $file2check['filename']);
 					}
-					
+					Tools::deleteDirectory($sandbox, true);
 				}
-				Tools::deleteDirectory($sandbox, true);
 				
 				if (count($this->errors))
 					return false;