diff --git a/dkbuild b/dkbuild
index 3df7a11..f071ec4 100755
--- a/dkbuild
+++ b/dkbuild
@@ -2213,7 +2213,10 @@ fi
         cd "$destdir" || die
 
         [ -n "$action" ] || action=install
-        [ "$action" == none ] && return
+        if [ "$action" == none ]; then
+            cd "$cwd"
+            return
+        fi
 
         local build="${DEFAULTS[build_build]-1}"
         local args
@@ -2267,7 +2270,10 @@ fi
             shift
         done
 
-        [ -n "$build" ] || return
+        if [ -z "$build" ]; then
+            cd "$cwd"
+            return
+        fi
 
         if [ "$php" != force -a "$php" != any ]; then
             # Si php n'est pas disponible dans le PATH, forcer l'utilisation de
@@ -2503,7 +2509,10 @@ cd "$projdir"
         cd "$destdir" || die
 
         [ -n "$action" ] || action=package
-        [ "$action" == none ] && return
+        if [ "$action" == none ]; then
+            cd "$cwd"
+            return
+        fi
 
         local build="${DEFAULTS[build_build]-1}"
         local args="${DEFAULTS[mvn_args]}"
@@ -2549,7 +2558,10 @@ cd "$projdir"
             shift
         done
 
-        [ -n "$build" ] || return
+        if [ -z "$build" ]; then
+            cd "$cwd"
+            return
+        fi
 
         local version
         case "$action" in