diff --git a/go.mod b/go.mod
index 2826060..12d3c97 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,7 @@
 module gitlab.com/unboundsoftware/dancefinder/geo-service
 
+go 1.13
+
 require (
 	github.com/caarlos0/env v3.5.0+incompatible
 	github.com/google/uuid v1.1.0
diff --git a/main.go b/main.go
index a3ee822..e9c6d3a 100644
--- a/main.go
+++ b/main.go
@@ -150,7 +150,6 @@ func handleLatLongRequest(w http.ResponseWriter, r *http.Request, client *maps.C
 		Address:      r.URL.Path[len("/latlong/"):],
 	}
 	if result, err := client.Geocode(context.Background(), req); err != nil {
-		log.Fatalf("fatal error: %s", err)
 		w.WriteHeader(400)
 	} else {
 		if len(result) > 0 {
@@ -159,11 +158,12 @@ func handleLatLongRequest(w http.ResponseWriter, r *http.Request, client *maps.C
 				Long:         result[0].Geometry.Location.Lng,
 			}
 			if response, err := json.Marshal(l); err != nil {
-				log.Fatalf("fatal error: %s", err)
-				w.WriteHeader(404)
+				w.WriteHeader(500)
 			} else {
 				_, _ = w.Write(response)
 			}
-		}
+		} else {
+		  w.WriteHeader(404)
+    }
 	}
-}
\ No newline at end of file
+}