From 9b70ff3cddb1fbf698fab6e2a67b989845bffaf7 Mon Sep 17 00:00:00 2001
From: Dominik Lindner <d.lindner@dundee.ac.uk>
Date: Tue, 3 Jul 2018 09:40:59 +0100
Subject: [PATCH] Another null check

---
 components/blitz/src/omero/gateway/model/ROIData.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/blitz/src/omero/gateway/model/ROIData.java b/components/blitz/src/omero/gateway/model/ROIData.java
index 7dde5a1d8d1..090642fbcbd 100644
--- a/components/blitz/src/omero/gateway/model/ROIData.java
+++ b/components/blitz/src/omero/gateway/model/ROIData.java
@@ -307,8 +307,12 @@ public ROICoordinate lastPlane() {
     public Iterator<List<ShapeData>> getShapesInRange(ROICoordinate start,
             ROICoordinate end) {
         List<List<ShapeData>> res = new ArrayList<List<ShapeData>>();
-        res.addAll(roiShapes.subMap(start, end).values());
-        res.add(roiShapes.get(new ROICoordinate(-1, -1)));
+        Collection<List<ShapeData>> inRange = roiShapes.subMap(start, end).values();
+        if (inRange != null)
+            res.addAll(inRange);
+        List<ShapeData> allRanges = roiShapes.get(new ROICoordinate(-1, -1));
+        if (allRanges != null)
+            res.add(allRanges);
         return res.iterator();
     }