diff --git a/src/main/java/org/rutebanken/tiamat/importer/merging/MergingStopPlaceImporter.java b/src/main/java/org/rutebanken/tiamat/importer/merging/MergingStopPlaceImporter.java
index f57f6f17f..28f2ecc0b 100644
--- a/src/main/java/org/rutebanken/tiamat/importer/merging/MergingStopPlaceImporter.java
+++ b/src/main/java/org/rutebanken/tiamat/importer/merging/MergingStopPlaceImporter.java
@@ -36,6 +36,7 @@
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -209,6 +210,7 @@ private StopPlace findNearbyOrExistingStopPlace(StopPlace newStopPlace) {
                         }
                         return true;
                     })
+                    .filter(Objects::nonNull)
                     .findAny();
 
             if(nearbyExistingStopPlace.isPresent()) {