diff --git a/rpc/http_server.go b/rpc/http_server.go
index 58c30924a..63a761093 100644
--- a/rpc/http_server.go
+++ b/rpc/http_server.go
@@ -74,9 +74,9 @@ func RecoverAndLogHandler(handler http.Handler) http.Handler {
 					WriteRPCResponse(rww, res)
 				} else {
 					// For the rest,
-					rww.WriteHeader(http.StatusInternalServerError)
-					rww.Write([]byte("Internal Server Error"))
 					log.Error("Panic in HTTP handler", "error", e, "stack", string(debug.Stack()))
+					rww.WriteHeader(http.StatusInternalServerError)
+					WriteRPCResponse(rww, NewRPCResponse(nil, Fmt("Internal Server Error: %v", e)))
 				}
 			}