diff --git a/devel.sh b/devel.sh
index 1ab9a44..78a3b42 100755
--- a/devel.sh
+++ b/devel.sh
@@ -18,7 +18,11 @@ function clean {
 
 function update {
     composer update
-    composer dumpautoload -v
+    $rv = $?
+    if [[ $rv > 0 ]]; then
+        composer dumpautoload -v
+    fi
+    return $rv
 }
 
 if [[ $# -ne 1 ]]; then
@@ -35,15 +39,23 @@ fi
 cmd=$1
 if [[ $cmd == "update" ]]; then
     update
+    exit $?
 elif [[ $cmd == "test" ]]; then
     if [[ ! -d "vendor/" ]]; then
         update
+        if [[ $? -ne 0 ]]; then
+            exit $?
+        fi
     fi
-    ./vendor/bin/phpunit --testdox tests
+    ./vendor/bin/phpunit --testdox --stderr tests
+    exit $?
 elif [[ $cmd == "tidy" ]]; then
     tidy
 elif [[ $cmd == "clean" ]]; then
     tidy && clean
 else
     echo "Unrecognized verb: ${cmd}"
+    exit 1
 fi
+
+exit 0