diff --git a/cronjob-warn-git-status b/cronjob-warn-git-status
index f70fed5..c4dd959 100755
--- a/cronjob-warn-git-status
+++ b/cronjob-warn-git-status
@@ -1,19 +1,22 @@
 #!/bin/bash
 
-# Default configuration.
-CHECK_DIRS=('/')
-EMAIL_TO=('sysadmin@slackware.uk')
-EMAIL_FROM="\"Server: ${HOSTNAME%%.*}\" <noreply@slackware.uk>"
+# Configuration.
+EMAIL_FROM="\"Server: ${HOSTNAME%%.*}\" <noreply@slackware.uk.net>"
+EMAIL_TO=("Systems' Administrator <sysadmin@slackware.uk>")
 
-# Allow /etc/default/warn-git-status to override default configuration.
-[[ -e /etc/default/warn-git-status ]] && {
+# Read the default configuration from /etc/default/warn-git-status.
+if [[ -e /etc/default/warn-git-status ]]; then
   # shellcheck disable=SC1091
   source /etc/default/warn-git-status || {
     printf "%s: %s\\n" "${0##*/}" "failed reading /etc/default/warn-git-status" >&2
     exit 1
   }
-}
+else
+  printf "%s: %s\\n" "${0##*/}" "/etc/default/warn-git-status does not exist" >&2
+  exit 1
+fi
 
+# Temporary output file.
 OUTPUT_FILE="/tmp/${0##*/}-$$-$RANDOM"
 
 # Remove the OUTPUT_FILE when done.
@@ -22,8 +25,10 @@ trap 'rm -f "$OUTPUT_FILE"' EXIT
 # Loop through the list and process.
 for DIR in "${CHECK_DIRS[@]}"; do
   [[ ! -e "$DIR" ]] || [[ ! -d "$DIR" ]] && continue
+
   TMP_OUTPUT="$(cd "$DIR" && [[ "$(git rev-parse --show-toplevel)" == "$PWD" ]] && git status | grep -E -ve "^(On branch|Your branch|No commits|nothing|$)" -e "\(use")"
   [[ -n "$TMP_OUTPUT" ]] && printf "%s:\\n%s\\n\\n" "$DIR" "$TMP_OUTPUT" >>"$OUTPUT_FILE"
+
   unset TMP_OUTPUT
 done
 
@@ -32,24 +37,14 @@ done
   exit 0
 }
 
-# Send the message.
-if [[ -n "${EMAIL_TO[*]}" ]]; then
-  if hash mailx >/dev/null 2>&1; then
-    mailx -S "from=$EMAIL_FROM" -s "Git statuses" "${EMAIL_TO[@]}" <"$OUTPUT_FILE" 2>/dev/null || {
-      printf "%s: %s\\n" "${0##*/}" "mailx command failed" >&2
-      exit 1
-    }
-  elif hash mail >/dev/null 2>&1; then
-    mail -r "$EMAIL_FROM" -s "Git statuses" "${EMAIL_TO[@]}" <"$OUTPUT_FILE" 2>/dev/null || {
-      printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2
-      exit 1
-    }
-  else
-    printf "%s: %s\\n" "${0##*/}" "no mailer command found" >&2
+# Send the notification message.
+if [[ -n "$EMAIL_FROM" ]] && [[ -n "${EMAIL_TO[*]}" ]]; then
+  mail -r "$EMAIL_FROM" -s "Git statuses" "${EMAIL_TO[@]}" <"$OUTPUT_FILE" >/dev/null 2>&1 || {
+    printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2
     exit 1
-  fi
+  }
 else
-  printf "%s: %s\\n" "${0##*/}" "no recipient configured for mail delivery" >&2
+  printf "%s: %s\\n" "${0##*/}" "no sender and/or recipient configured for mail delivery" >&2
   exit 1
 fi