diff --git a/.gitignore b/.gitignore
index a6056c833a..405aebfbf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,10 @@ src/nebula/oned
 share/doc/one/html
 
 *.class
+src/oca/java/bin
 src/oca/java/jar
 src/oca/java/share/doc
+src/oca/java/java-oca*.tar.gz
 
 src/sunstone/public/.sass-cache
 src/sunstone/public/node_modules
diff --git a/src/oca/java/build.sh b/src/oca/java/build.sh
index 9a7adc6b76..dc4eb200b4 100755
--- a/src/oca/java/build.sh
+++ b/src/oca/java/build.sh
@@ -16,6 +16,8 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+set -e
+
 #-------------------------------------------------------------------------------
 # DIR DEFINITIONS
 #-------------------------------------------------------------------------------
@@ -117,7 +119,10 @@ do_clean()
     mkdir -p $BIN_DIR
 
     find share/examples -name '*.class' -delete
-    find test/ -name '*.class' -delete
+
+    if [ -d test/ ]; then
+        find test/ -name '*.class' -delete
+    fi
 
     echo "Cleaning javadoc files..."
     rm -rf $DOC_DIR > /dev/null 2>&1