diff --git a/AUTHORS b/AUTHORS
index 9a22e88de7..7b1bba49e7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -185,4 +185,5 @@ Vladimir Kirillov <proger@wilab.org.ua>
 Walter Stanish <walter@pratyeka.org>
 Wes Morgan <cap10morgan@gmail.com>
 Will Dietz <w@wdtz.org>
+Yang Bai <hamo.by@gmail.com>
 Zaiste! <oh@zaiste.net>
diff --git a/sysinit.go b/sysinit.go
index 34f1cbdac6..c569d57264 100644
--- a/sysinit.go
+++ b/sysinit.go
@@ -27,7 +27,9 @@ func setupWorkingDirectory(workdir string) {
 	if workdir == "" {
 		return
 	}
-	syscall.Chdir(workdir)
+	if err := syscall.Chdir(workdir); err != nil {
+		log.Fatalf("Unable to change dir to %v: %v", workdir, err)
+	}
 }
 
 // Takes care of dropping privileges to the desired user