diff --git a/cmd/registry/main.go b/cmd/registry/main.go
index 49132bf1b..7bcacc810 100644
--- a/cmd/registry/main.go
+++ b/cmd/registry/main.go
@@ -61,6 +61,7 @@ func main() {
 
 	app := handlers.NewApp(ctx, *config)
 	handler := configureReporting(app)
+	handler = panicHandler(handler)
 	handler = gorhandlers.CombinedLoggingHandler(os.Stdout, handler)
 
 	if config.HTTP.Debug.Addr != "" {
@@ -272,3 +273,17 @@ func debugServer(addr string) {
 		log.Fatalf("error listening on debug interface: %v", err)
 	}
 }
+
+// panicHandler add a HTTP handler to web app. The handler recover the happening
+// panic. logrus.Panic transmits panic message to pre-config log hooks, which is
+// defined in config.yml.
+func panicHandler(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		defer func() {
+			if err := recover(); err != nil {
+				log.Panic(fmt.Sprintf("%v", err))
+			}
+		}()
+		handler.ServeHTTP(w, r)
+	})
+}