diff --git a/main.go b/main.go
index 633e3cdde7741d9df69b5e55c98f9135a6d90212..306db29d923df6e3dce9c1630cbd18aa6e2e8946 100644
--- a/main.go
+++ b/main.go
@@ -165,9 +165,12 @@ func main() {
 	log.Printf("Starting service on port %s.", addr)
 	go func() {
 		if certFilename != "" && keyFilename != "" {
-			srv.ListenAndServeTLS(certFilename, keyFilename)
+			err = srv.ListenAndServeTLS(certFilename, keyFilename)
 		} else {
-			srv.ListenAndServe()
+			err = srv.ListenAndServe()
+		}
+		if err != http.ErrServerClosed {
+			log.Fatalf("Failed to run Web server: %s", err)
 		}
 	}()