diff --git a/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java b/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
index 6fd9c7144201718309e5970080cf0aedd303b22b..74b3721bdfe93229b0b76c47698d5ce413c52289 100755
--- a/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
+++ b/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
@@ -215,12 +215,18 @@ public class VIPSMobileService {
         cropCategories.stream().forEach(
                 cc -> {
                     List<Organism> ccCropList = new ArrayList<>();
-                    Arrays.asList(cc.getCropOrganismIds()).stream().forEach(
+                    cc.getCropOrganismIds().stream().forEach(
                             cropId -> {
-                                ccCropList.add(allCrops.get(cropId));
+                                if(allCrops.get(cropId) != null)
+                                {
+                                    ccCropList.add(allCrops.get(cropId));
+                                }
                             }
                     );
-                    retVal.add(new VIPSMobileCropCategory(cc, ccCropList, "nb"));
+                    if(!ccCropList.isEmpty())
+                    {
+                        retVal.add(new VIPSMobileCropCategory(cc, ccCropList, "nb"));
+                    }
                 }
         );