diff --git a/tools/docker-images/clp-package/build.sh b/tools/docker-images/clp-package/build.sh
index a7d19d997a..1e4948c464 100755
--- a/tools/docker-images/clp-package/build.sh
+++ b/tools/docker-images/clp-package/build.sh
@@ -8,10 +8,10 @@ remove_temp_file_and_prev_image() {
 
     [[ -z "$prev_image_id" || "$prev_image_id" == "$new_image_id" ]] && return
 
-    if docker image inspect "$prev_image_id" >/dev/null 2>&1; then
-        echo "Removing previous image $prev_image_id."
-        docker image remove "$prev_image_id"
-    fi
+    docker image inspect "$prev_image_id" >/dev/null 2>&1 || return
+
+    echo "Removing previous image $prev_image_id."
+    docker image remove "$prev_image_id" || true
 }
 trap remove_temp_file_and_prev_image EXIT