diff --git a/mail_template b/mail_template
index d96158b..4766e2f 100644
--- a/mail_template
+++ b/mail_template
@@ -1,4 +1,4 @@
-Subject: [AUTOMATION TEST MAIL] [URGENT] Server Report
+Subject: [URGENT] Server Report
 Priority: urgent
 Importance: high
 
diff --git a/status-check.sh b/status-check.sh
index 7268c39..8367a4c 100755
--- a/status-check.sh
+++ b/status-check.sh
@@ -2,8 +2,10 @@
 
 #set -eux
 
-RECIPIENTS="saunders@openworlds.info"
-#witchescauldron@openworlds.info"
+RECIPIENTS=(
+    saunders@openworlds.info
+    witchescauldron@openworlds.info
+)
 
 URLS=(
     unite.openworlds.info
@@ -39,14 +41,16 @@ send_mail() {
 
     cat mail_template \
         | sed "s/{ERR_LIST}/${error_string}/g" \
-        | msmtp -a omn_server_watch ${RECIPIENTS}
+        | msmtp -a omn_server_watch ${RECIPIENTS[@]} 2>/dev/null
 }
 
 declare -A FLAGGED
 
+echo "== Checking:"
+
 for uri in "${URLS[@]}"; do \
     full_uri="https://${uri}"
-    echo -n "Checking: ${full_uri} ... ";
+    echo -n "  ${full_uri} ... ";
     stat="$(curl -s -o /dev/null -w "%{http_code}%{stdout}" ${full_uri})"
     echo "${stat}"
 
@@ -56,4 +60,20 @@ for uri in "${URLS[@]}"; do \
     fi
 done
 
-send_mail FLAGGED
+ret=0
+
+if ((${#FLAGGED[@]} > 0)); then
+    echo "== Error(s) detected. Sending mail to:"
+
+    for rcp in ${RECIPIENTS[@]}; do
+        echo "  ${rcp}"
+    done
+
+    send_mail FLAGGED
+    ret=1
+
+else
+    echo "== OK"
+fi
+
+exit ${ret}