diff --git a/scripts/repo-clean.sh b/scripts/repo-clean.sh
index 1ad39cae..d6231621 100755
--- a/scripts/repo-clean.sh
+++ b/scripts/repo-clean.sh
@@ -26,10 +26,13 @@ rm -rf $RDIR/toolchains/esp-tools/riscv-tests/build.log
     popd
 )
 (
-    pushd $RDIR/generators/cva6/src/main/resources/vsrc/cva6
-    if [ -d cva6 ]
+    if [ -d $RDIR/generators/cva6/src/main/resources/vsrc/cva6 ]
     then
-	git submodule deinit -f cva6
+        pushd $RDIR/generators/cva6/src/main/resources/vsrc/cva6
+        if [ -d cva6 ]
+        then
+	    git submodule deinit -f cva6
+        fi
+        popd
     fi
-    popd
 )