diff --git a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
index 8f1534f66f9046e2ed3fb78086db4697fafcb8ca..c983c3fa86aacde063996f407096405c8b79d1bb 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
@@ -252,8 +252,14 @@ public class PointOfInterestBean {
      * @return 
      */
     public List<PointOfInterestWeatherStation> getWeatherstationsForOrganization(Organization organization, Boolean active) {
+        
+        if(organization == null)
+        {
+            return new ArrayList<>();
+        }
         // Avoid nulls
         active = active == null ? true : active;
+        
         List<PointOfInterestWeatherStation> retVal = em.createNamedQuery("PointOfInterestWeatherStation.findByActivityAndOrganizationId", PointOfInterestWeatherStation.class)
                                                 .setParameter("organizationId", organization)
                                                 .setParameter("active", active)