diff --git a/build-all.sh b/build-all.sh
index 4becd9c70e9555f2ab78b15868e555edcbd8c82b..378d392180ef35d00bfadf80a7027b9a8af48f16 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -63,13 +63,14 @@ scons  || exit
 cd $PEASOUP_HOME
 make || exit
 
-cd $ZIPR_CALLBACKS
-./configure --enable-p1 --prefix=$ZIPR_INSTALL
-make  || exit
-make install || exit
-
+if [ -d $ZIPR_CALLBACKS ]; then 
+	cd $ZIPR_CALLBACKS
+	./configure --enable-p1 --prefix=$ZIPR_INSTALL
+	make  || exit
+	make install || exit
+fi
 
-if [ -d $ZIPR_HOME ];  then
+if [ -d $ZIPR_HOME ]; then
 	cd $ZIPR_HOME
 	scons  || exit
 fi
diff --git a/clean-all.sh b/clean-all.sh
index cb2e33f0adb53e16e1c71a7a9f674b84aaa8169f..004ee9d903e337a2f0fde4f429848551e35648bf 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -29,11 +29,15 @@ scons -c || exit
 cd $IRDB_TRANSFORMS
 scons -c || exit
 
-cd $ZIPR_SCFI_PLUGIN
-scons  -c || exit
+if [ -d $ZIPR_SCFI_PLUGIN ]; then
+	cd $ZIPR_SCFI_PLUGIN
+	scons  -c || exit
+fi
 
 cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
 scons -c || exit
 
-cd $ZIPR_HOME
-scons -c || exit
+if [ -d $ZIPR_HOME ]; then 
+	cd $ZIPR_HOME
+	scons -c || exit
+fi