gistfile1.txt

diff --git a/http/service.go b/http/service.go
index cd7f70d..e7776a1 100644
--- a/http/service.go
+++ b/http/service.go
@@ -876,6 +876,9 @@ func (s *Service) handleExecute(w http.ResponseWriter, r *http.Request) {
 
 	if resultsErr != nil {
 		resp.Error = resultsErr.Error()
+		if results == nil {
+			http.Error(w, resultsErr.Error(), http.StatusInternalServerError)
+		}
 	} else {
 		resp.Results.ExecuteResult = results
 	}
@@ -965,6 +968,9 @@ func (s *Service) handleQuery(w http.ResponseWriter, r *http.Request) {
 
 	if resultsErr != nil {
 		resp.Error = resultsErr.Error()
+		if results == nil {
+			http.Error(w, resultsErr.Error(), http.StatusInternalServerError)
+		}
 	} else {
 		resp.Results.QueryRows = results
 	}