diff --git a/ssh-tunnel-manager.sh b/ssh-tunnel-manager.sh
index a6ed2537be206bb2aa45f2c97e5133ef35039164..e9c2c96fe484c13017e14195bd14bb8fc61ce06a 100755
--- a/ssh-tunnel-manager.sh
+++ b/ssh-tunnel-manager.sh
@@ -287,7 +287,7 @@ case $COMMAND in
 			COMMAND_INDEX=$(get_id_from_name "$COMMAND_INDEX_NAME")
 			if [[ "$COMMAND_INDEX" -eq "-1" ]]; then
 				echo "The tunnel with the name '$COMMAND_INDEX_NAME' can not be found."
-				exit 1
+				exit 6
 			fi
 			IDX_START=$COMMAND_INDEX
 			IDX_END=$((COMMAND_INDEX+1))
@@ -339,7 +339,7 @@ case $COMMAND in
 			COMMAND_INDEX=$(get_id_from_name "$COMMAND_INDEX_NAME")
 			if [[ "$COMMAND_INDEX" -eq "-1" ]]; then
 				echo "The tunnel with the name '$COMMAND_INDEX_NAME' can not be found."
-				exit 1
+				exit 3
 			fi
 			IDX_START=$COMMAND_INDEX
 			IDX_END=$((COMMAND_INDEX+1))
@@ -361,7 +361,7 @@ case $COMMAND in
 			else
 				echotime "STATUS - Status of Tunnel '${TUNNEL_NAMES[$idx]}' (ID $idx) is ... NOT running"
 				echo "Status of Tunnel '${TUNNEL_NAMES[$idx]}' is ... NOT running"
-				EXIT_CODE=1
+				EXIT_CODE=3
 			fi
 		done
 		echotime "COMM - Execute STATUS procedure ... Done"
@@ -385,7 +385,7 @@ case $COMMAND in
 			COMMAND_INDEX=$(get_id_from_name "$COMMAND_INDEX_NAME")
 			if [[ "$COMMAND_INDEX" -eq "-1" ]]; then
 				echo "The tunnel with the name '$COMMAND_INDEX_NAME' can not be found."
-				exit 1
+				exit 6
 			fi
 			IDX_START=$COMMAND_INDEX
 			IDX_END=$((COMMAND_INDEX+1))
diff --git a/ssh-tunnel-manager.sysv-initscript b/ssh-tunnel-manager.sysv-initscript
index ce6d3f9d8b018a6cdd72aae86241c2c8089b82a7..4dec55bf39188534432bccc3215df7bc7b269ec3 100644
--- a/ssh-tunnel-manager.sysv-initscript
+++ b/ssh-tunnel-manager.sysv-initscript
@@ -38,8 +38,7 @@ stop() {
 }
 
 restart() {
-    stop
-    start
+    $exec restart
 }
 
 rh_status() {