diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index ad30641709..ca556d1039 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -589,10 +589,12 @@ case "$1" in
     ;;
   console)
     invoke_console
+    exit $?
     ;;
   stop)
     invoke_stop
     ;;
   *)
-    invoke_task
+    invoke_task checkforrunning
+    exit $?
 esac