diff --git a/sensu/files/checks/check_contrail_database.sh b/sensu/files/checks/check_contrail_database.sh
index c27df5e..7fcebb2 100644
--- a/sensu/files/checks/check_contrail_database.sh
+++ b/sensu/files/checks/check_contrail_database.sh
@@ -7,7 +7,7 @@
 read -ra contrail_status <<< $(sudo supervisorctl -s unix:///tmp/supervisord_$service.sock status)
 
 check_ok=0
-state=RUNNING
+state=FATAL
 
 read -ra contrail_test <<< ${contrail_status[@]#contrail-$service}
 #compare arrays
@@ -17,6 +17,12 @@
 
 if [ check_ok=1 ]; then
 
+        read -ra contrail_test <<< ${contrail_status[@]#RUNNING}
+
+        if [ ${#contrail_status[@]} -ne ${#contrail_test[@]} ]; then
+                state=RUNNING
+        fi
+
         read -ra contrail_test <<< ${contrail_status[@]#STARTING}
 
         if [ ${#contrail_status[@]} -ne ${#contrail_test[@]} ]; then
@@ -60,6 +66,6 @@
 	EXITVAL=2 #Status 2 = CRITICAL (red)
 fi
 
-echo State of contrail-$service OK:$OK WARN:$WARN CRIT:$CRIT - $LIST
+echo State of contrail-$service $state OK:$OK WARN:$WARN CRIT:$CRIT
 
 exit $EXITVAL