Merge remote-tracking branch 'origin/master'

# Conflicts:
#	servlet/server.go

servlet/server.go

@@ -1,7 +1,6 @@
 package servlet
 
 import (
-	"errors"
 	"fmt"
 	"geniuscartel.xyz/vinegar/vinegarUtil"
 	"log"
@@ -103,11 +102,22 @@ func (s *VinegarServlet) SendError(w http.ResponseWriter, req *http.Request, cod
 	if exists {
 		tmpl.TemplateManager.AddMixin("code", strconv.Itoa(code))
 		tmpl.TemplateManager.AddMixin("msg", msg)
+		w.WriteHeader(code)
+		_, err := w.Write([]byte(tmpl.TemplateManager.RenderTemplate(fmt.Sprintf("%d.html", code))))
+		if err != nil {
+			panic(err)
+		}
+		return
+	} else {
+		w.WriteHeader(code)
+		genericError, sErr := json.Marshal(msg)
+		if sErr != nil {
+			panic(sErr)
+		}
+		_, err := w.Write(genericError)
+		if err != nil {
+			panic(err)
+		}
+		return
 	}
-	w.WriteHeader(code)
-	_, err := w.Write([]byte(tmpl.TemplateManager.RenderTemplate(fmt.Sprintf("%d.html", code))))
-	if err != nil {
-		panic(err)
-	}
-	return
 }