diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index 9e0717149..6bfe6b9c7 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -685,11 +685,12 @@ def cleanup(toCleanDirs = []):
 
     for dir in toCleanDirs:
         print_info(red(" * ")+"Cleaning "+darkgreen(dir)+" directory...", back = True)
-	dircontent = os.listdir(dir)
-	if dircontent != []:
-	    for data in dircontent:
-		spawnCommand("rm -rf "+dir+"/"+data)
-		counter += 1
+	if os.path.isdir(dir):
+	    dircontent = os.listdir(dir)
+	    if dircontent != []:
+	        for data in dircontent:
+		    spawnCommand("rm -rf "+dir+"/"+data)
+		    counter += 1
 
     print_info(green(" * ")+"Cleaned: "+str(counter)+" files and directories")