diff --git a/spongy.cgi/spongy.cgi b/spongy.cgi/spongy.cgi
index a70c528..b278d99 100755
Binary files a/spongy.cgi/spongy.cgi and b/spongy.cgi/spongy.cgi differ
diff --git a/spongy.cgi/spongy.cgi.go b/spongy.cgi/spongy.cgi.go
index 3c1bf29..c816736 100644
--- a/spongy.cgi/spongy.cgi.go
+++ b/spongy.cgi/spongy.cgi.go
@@ -46,12 +46,14 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	cfg, err := ReadConfig(h.Dir)
 	if err != nil {
 		http.Error(w, err.Error(), 500)
+		return
 	}
 	
 	// Validate authtok
 	authtok, err := cfg.Get("authtok")
 	if err != nil {
 		http.Error(w, err.Error(), 500)
+		return
 	}
 	if r.FormValue("auth") != authtok {
 		w.Header().Set("Content-Type", "text/plain")