@@ -192,19 +192,13 @@ mux.HandleFunc(
 		"/.well-known/webfinger",
 		func(w http.ResponseWriter, r *http.Request) *ihttp.Error {
 			if r.URL.Query().Get("resource") == acctResource {
-				obj, err := json.Marshal(me)
-				if err != nil {
-
-					return &ihttp.Error{
-						Code: http.StatusInternalServerError,
-					}
-				}
-
 				w.Header().Add("Content-Type", "application/jrd+json")
 				w.Header().Add("Access-Control-Allow-Origin", "*")
-				_, err = w.Write(obj)
-				if err != nil {
-					log.Warn("error writing webfinger request", "error", err)
+				if err := json.NewEncoder(w).Encode(me); err != nil {
+					return &ihttp.Error{
+						Code:  http.StatusInternalServerError,
+						Cause: err,
+					}
 				}
 			}