diff --git a/cmd/influxd/run.go b/cmd/influxd/run.go
index e16d247b188..0115835c526 100644
--- a/cmd/influxd/run.go
+++ b/cmd/influxd/run.go
@@ -50,9 +50,14 @@ func Run(config *Config, join, version string, logWriter *os.File) (*messaging.B
 		// We want to make sure we are spun up before we exit this function, so we manually listen and serve
 		listener, err := net.Listen("tcp", config.BrokerAddr())
 		if err != nil {
-			log.Fatal(err)
+			log.Fatalf("failed to listen for broker on tcp: %s ", err)
 		}
-		go func() { log.Fatal(http.Serve(listener, h)) }()
+		go func() {
+			err := http.Serve(listener, h)
+			if err != nil {
+				log.Fatalf("failed to serve broker: %s", err)
+			}
+		}()
 		log.Printf("broker listening on %s", config.BrokerAddr())
 
 		// have it occasionally tell a data node in the cluster to run continuous queries