diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
index 26c650a7e6ec60216a3136d082090601f621d7ed..5d7e89b03feff979df167b10045366b87e2edf1b 100755
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -36,6 +36,21 @@ _daemon_pidfile() {
   echo "@LOCALSTATEDIR@/run/ganeti/$1.pid"
 }
 
+# Checks whether the local machine is part of a cluster
+check_config() {
+  local server_pem=@LOCALSTATEDIR@/lib/ganeti/server.pem
+  local fname
+
+  for fname in $server_pem; do
+    if [[ ! -f $fname ]]; then
+      echo "Missing configuration file $fname" >&2
+      return 1
+    fi
+  done
+
+  return 0
+}
+
 # Checks whether daemon is running
 check() {
   if [[ "$#" -lt 1 ]]; then
diff --git a/doc/examples/ganeti.initd.in b/doc/examples/ganeti.initd.in
index 5dc03962fb6c3a3afd0375d9e655802651485d54..5ad3a9ba265a947df9febeb64438e9bc2f53dda2 100644
--- a/doc/examples/ganeti.initd.in
+++ b/doc/examples/ganeti.initd.in
@@ -27,18 +27,6 @@ test -f "@PREFIX@/sbin/$NODED" || exit 0
 
 . /lib/lsb/init-functions
 
-check_config() {
-    for fname in \
-        "@LOCALSTATEDIR@/lib/ganeti/server.pem"
-    do
-        if ! [ -f "$fname" ]; then
-            log_end_msg 0
-            log_warning_msg "Config $fname not there, will not run."
-            exit 0
-        fi
-    done
-}
-
 check_exitcode() {
     RC=$1
     case $RC in
@@ -80,7 +68,11 @@ maybe_do() {
 }
 
 start_all() {
-    check_config
+    if ! $DAEMON_UTIL check-config; then
+        log_warning_msg "Incomplete configuration, will not run."
+        exit 0
+    fi
+
     for i in $NODED $MASTERD $CONFD $RAPI; do \
         maybe_do "$1" start_action $i
     done
@@ -111,6 +103,7 @@ case "$1" in
         stop_all "$2"
         ;;
     restart|force-reload)
+        log_daemon_msg "Restarting $DESC" "$2"
         stop_all "$2"
         start_all "$2"
         ;;