diff --git a/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java b/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
index b09788237b49bb869d77879b7201ccc9d72a1ca8..7f08a0391eb1dce9730b5d8935a9892f62606fbc 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
@@ -111,7 +111,11 @@ public class RunAllForecastConfigurationsTask extends VipsLogicTask{
                     else if(
                         weatherStationPointOfInterestId == null
                         || weatherStationPointOfInterestId <= 0
-                        || (forecastConfiguration.getWeatherStationPointOfInterestId() != null && forecastConfiguration.getWeatherStationPointOfInterestId().getPointOfInterestId().equals(weatherStationPointOfInterestId))
+                        || (
+                            forecastConfiguration.getWeatherStationPointOfInterestId() != null 
+                            && forecastConfiguration.getWeatherStationPointOfInterestId().getPointOfInterestId() != null 
+                            && forecastConfiguration.getWeatherStationPointOfInterestId().getPointOfInterestId().equals(weatherStationPointOfInterestId)
+                           )
                     )
 
                     {