diff --git a/gateways.go b/gateways.go
index 7020b96fb8788044a45860b649ee104184b7a437..a72ea738fe4376f3d332937ed78ae606d65d962d 100644
--- a/gateways.go
+++ b/gateways.go
@@ -69,7 +69,6 @@ func (b *bonafide) getGateways() ([]gateway, error) {
 func (b *bonafide) fetchEipJSON() error {
 	resp, err := b.client.Post(b.eipAPI, "", nil)
 	if err != nil {
-		log.Println("Error fetching json: ", err)
 		return err
 	}
 	defer resp.Body.Close()
diff --git a/main.go b/main.go
index 5f7a66bb77d8baf884480e34816eb6c8e0113130..b8791941b39b4d94f4aa1631504fed88b4a91f64 100644
--- a/main.go
+++ b/main.go
@@ -276,7 +276,10 @@ func main() {
 
 	log.Println("Seeding gateway list from " + configuredAPI)
 	bonafide := newBonafide(configuredAPI)
-	bonafide.getGateways()
+	_, err = bonafide.getGateways()
+	if err != nil {
+		log.Fatal("Error fetching gateways:", err)
+	}
 
 	geoipdb.geolocateGateways(bonafide)
 	bonafide.listGateways()