diff --git a/timeoutd.c b/timeoutd.c
index 6fac1ce..c3cf310 100644
--- a/timeoutd.c
+++ b/timeoutd.c
@@ -340,13 +340,37 @@ char *argv[];
     }
 
     /* If running in daemon mode (no parameters) */
-    if (fork())                 /* the parent process */
-        exit(0);                /* exits */
+    pid_t pid;
+
+    if ((pid = fork()) < 0) {
+        openlog("timeoutd", OPENLOG_FLAGS, LOG_DAEMON);
+        syslog(LOG_ERR, "Failed to execute fork number 1");
+        closelog();
+        exit(1);
+    }
+    if (pid > 0)
+        exit(0);
 
     close(0);
     close(1);
     close(2);
-    setsid();
+    if (setsid() < 0) {
+        openlog("timeoutd", OPENLOG_FLAGS, LOG_DAEMON);
+        syslog(LOG_ERR, "Failed to set new session ID at startup.");
+        closelog();
+        exit(1);
+    }
+
+    if ((pid = fork()) < 0) {
+        openlog("timeoutd", OPENLOG_FLAGS, LOG_DAEMON);
+        syslog(LOG_ERR, "Failed to execute fork number 2");
+        closelog();
+        exit(1);
+    }
+    if (pid > 0)
+        exit(0);
+
+    umask(0);
 
     openlog("timeoutd", OPENLOG_FLAGS, LOG_DAEMON);
     syslog(LOG_NOTICE, "Daemon started.");