diff --git a/update_psa_helpers b/update_psa_helpers
index 176c8a2..d64ca02 100755
--- a/update_psa_helpers
+++ b/update_psa_helpers
@@ -379,38 +379,28 @@ check_for_apism () {
         APISM_RUNNING=1
         log_debug "$func:${LINENO}: APISM running..."
         return 0
-    else
-        log_crit "$func:${LINENO}: *************************"
-        log_crit "$func:${LINENO}: !!! APISM NOT RUNNING !!!"
-        log_crit "$func:${LINENO}: *************************"
     fi
-    return 1
+    log_fatal "$func:${LINENO}: !!! APISM NOT RUNNING !!!"
 }
 
 check_default_route () {
+    local func="${FUNCNAME[0]}"
     if ip route | head -n 1 | grep -q '^default'
         log_debug "$func:${LINENO}: default route set"
         return 0
-    then
-        log_crit "$func:${LINENO}: ***************************************"
-        log_crit "$func:${LINENO}: !!! NO DEFAULT ROUTE SET !!! Exiting..."
-        log_crit "$func:${LINENO}: ***************************************"
-        exit 1
     fi
+    log_fatal "$func:${LINENO}: !!! NO DEFAULT ROUTE SET !!!"
 }
 
 check_route_to_repository () {
+    local func="${FUNCNAME[0]}"
     # ip_address=$1, e.g. git.mimbach.de (185.191.219.134)
     # 185.191.219.134 via 192.168.5.254 ...
     if test "$#" -eq 1 && ip route get "$1" | head -n 1 | grep -q "^$1"
         log_debug "$func:${LINENO}: route to repository available"
         return 0
-    then
-        log_crit "$func:${LINENO}: ***************************************"
-        log_crit "$func:${LINENO}: !!! NO ROUTE TO REPO SET !!! Exiting..."
-        log_crit "$func:${LINENO}: ***************************************"
-        exit 1
     fi
+    log_fatal "$func:${LINENO}: !!! NO ROUTE TO REPO SET !!!"
 }
 
 get_customer_id () {