diff --git a/cmd/rest-server/main.go b/cmd/rest-server/main.go
index dc91b71..c18523b 100644
--- a/cmd/rest-server/main.go
+++ b/cmd/rest-server/main.go
@@ -42,10 +42,10 @@ func runRoot(cmd *cobra.Command, args []string) error {
 	if restserver.Config.CPUProfile != "" {
 		f, err := os.Create(restserver.Config.CPUProfile)
 		if err != nil {
-			log.Fatal(err)
+			return err
 		}
 		if err := pprof.StartCPUProfile(f); err != nil {
-			log.Fatal(err)
+			return err
 		}
 		log.Println("CPU profiling enabled")
 		defer pprof.StopCPUProfile()
@@ -75,12 +75,8 @@ func runRoot(cmd *cobra.Command, args []string) error {
 		log.Printf("Starting server on %s\n", restserver.Config.Listen)
 		err = http.ListenAndServeTLS(restserver.Config.Listen, publicKey, privateKey, handler)
 	}
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return nil
 
+	return err
 }
 
 func main() {
diff --git a/mux.go b/mux.go
index 23c5072..f67397f 100644
--- a/mux.go
+++ b/mux.go
@@ -34,7 +34,7 @@ func debugHandler(next http.Handler) http.Handler {
 func logHandler(next http.Handler) http.Handler {
 	accessLog, err := os.OpenFile(Config.Log, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("error: %v", err)
 	}
 
 	return handlers.CombinedLoggingHandler(accessLog, next)