diff --git a/clean-all.sh b/clean-all.sh
index 4a1bc0d25e90288a4eab1768de179093a4d0dffb..cd329ecea58b271118f52ac8c8892a3a1529b227 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -58,4 +58,10 @@ if [ -d $ZIPR_HOME ]; then
 fi
 
 cd $PEASOUP_UMBRELLA_DIR
-./clean_diehard.sh
+
+if [ -d DieHard ]; then
+	cd DieHard
+	./clean_diehard.sh
+fi
+
+cd $PEASOUP_UMBRELLA_DIR