diff --git a/solr/files/solr.init b/solr/files/solr.init
index f8fb313..2ab842f 100644
--- a/solr/files/solr.init
+++ b/solr/files/solr.init
@@ -27,14 +27,12 @@ fi
 if [ ! -e "${SOLRPATH}/start.jar" ]; then
     echo "Failed to find Solr jar file: ${SOLRPATH}/start.jar"
     echo "Check /etc/init.d/solr file for correct settings."
-    RETVAL=1
     exit 1
 fi
 
 if [ ! -e "${CONFIGPATH}/solr.xml" ]; then
     echo "Failed to find Solr config files: ${CONFIGPATH}/solr.xml"
     echo "Check /etc/init.d/solr file for correct settings."
-    RETVAL=1
     exit 1
 fi
 
@@ -46,7 +44,6 @@ start_solr() {
         echo "[FAILED]"
         echo
         echo "Reason: Solr already running"
-        RETVAL=1
         exit 1
     fi
 
@@ -84,6 +81,7 @@ case "$1" in
 
     status)
         pgrep -u $SOLRUSER -f start.jar >/dev/null
+        exit $?
         ;;
 
     *)