diff --git a/src/server/server.go b/src/server/server.go
index 419c553..224c46e 100644
--- a/src/server/server.go
+++ b/src/server/server.go
@@ -246,7 +246,7 @@ func (h *CreateNoteWithFormHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 		}
 
 		h.logger.Debug("checking file content type")
-		if handler.Header.Get("Content-Type") != "text/plain" {
+		if !strings.HasPrefix(handler.Header.Get("Content-Type"), "text/") {
 			h.PageData.Err = fmt.Errorf("text file expected (got %s)", handler.Header.Get("Content-Type"))
 			h.Templates.ExecuteTemplate(w, templateName, h.PageData)
 			return
@@ -377,6 +377,12 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re
 		return
 	}
 
+	if note == nil {
+		h.PageData.Err = fmt.Errorf("Note doesn't exist or has been deleted")
+		h.Templates.ExecuteTemplate(w, templateName, h.PageData)
+		return
+	}
+
 	if password != "" && note.Encrypted {
 		note.Content, err = internal.Decrypt(note.Content, password)
 		if err != nil {