diff --git a/internal/metrics/crawler.go b/internal/metrics/crawler.go
index 7396143..97a9573 100644
--- a/internal/metrics/crawler.go
+++ b/internal/metrics/crawler.go
@@ -138,6 +138,7 @@ func (s *CrawlerServiceMetrics) StartIPCountryMapping(limit uint) {
 	})
 	if err != nil {
 		log.Printf("Error getting IPs: %s\n", err.Error())
+		return
 	}
 
 	s.GetIPsAfterTimestamp(ipsAfterTimestamp)
@@ -150,6 +151,10 @@ func (s *CrawlerServiceMetrics) GetIPsAfterTimestamp(ips *rpc.GetIPsAfterTimesta
 		return
 	}
 
+	if ips == nil {
+		return
+	}
+
 	type countStruct struct {
 		ISOCode string
 		Name    string