diff --git a/handlers/check.go b/handlers/check.go
index 1c0242f..e5bf34f 100644
--- a/handlers/check.go
+++ b/handlers/check.go
@@ -20,6 +20,7 @@ func CheckHandler(w http.ResponseWriter, r *http.Request) {
 		b, _ := json.Marshal(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write(b)
+		return
 	}
 
 	b, err := json.Marshal(resp)
diff --git a/handlers/checks.go b/handlers/checks.go
index decfefa..9664490 100644
--- a/handlers/checks.go
+++ b/handlers/checks.go
@@ -121,6 +121,9 @@ func newChecksResp(repo string, forceRefresh bool) (checksResp, error) {
 	if err != nil {
 		return checksResp{}, fmt.Errorf("Could not get filenames: %v", err)
 	}
+	if len(filenames) == 0 {
+		return checksResp{}, fmt.Errorf("No .go files found")
+	}
 	checks := []check.Check{check.GoFmt{Dir: dir, Filenames: filenames},
 		check.GoVet{Dir: dir, Filenames: filenames},
 		check.GoLint{Dir: dir, Filenames: filenames},