diff --git a/src/main/java/de/avatic/lcc/service/api/BatchGeoApiService.java b/src/main/java/de/avatic/lcc/service/api/BatchGeoApiService.java
index a0d0cd8..3246879 100644
--- a/src/main/java/de/avatic/lcc/service/api/BatchGeoApiService.java
+++ b/src/main/java/de/avatic/lcc/service/api/BatchGeoApiService.java
@@ -73,7 +73,8 @@ public class BatchGeoApiService {
                     if (!result.getFeatures().isEmpty() &&
                             (result.getFeatures().getFirst().getProperties().getConfidence().equalsIgnoreCase("high") ||
                                     result.getFeatures().getFirst().getProperties().getConfidence().equalsIgnoreCase("medium") ||
-                                    result.getFeatures().getFirst().getProperties().getMatchCodes().stream().anyMatch(s -> s.equalsIgnoreCase("good")))) {
+                                    (result.getFeatures().getFirst().getProperties().getMatchCodes() != null &&
+                                    result.getFeatures().getFirst().getProperties().getMatchCodes().stream().anyMatch(s -> s.equalsIgnoreCase("good"))))) {
                         var geometry = result.getFeatures().getFirst().getGeometry();
                         var properties = result.getFeatures().getFirst().getProperties();
                         node.setGeoLng(BigDecimal.valueOf(geometry.getCoordinates().get(0)));