diff --git a/components/tools/OmeroPy/test/integration/ishare.py b/components/tools/OmeroPy/test/integration/ishare.py
index 9b10ec8ef3a..885451d5206 100644
--- a/components/tools/OmeroPy/test/integration/ishare.py
+++ b/components/tools/OmeroPy/test/integration/ishare.py
@@ -711,6 +711,15 @@ def test5851(self):
         adminService.getEventContext() # Refreshes
         self.assertExpiration(expiration, shareService.getShare(sid))
 
+    def test2513(self):
+        """
+        Test a few NPE scenarios in IShare
+        """
+        shares = self.client.sf.getShareService()
+        bad_screen = ( shares.createShare, "my description", None,
+                [omero.model.ScreenI()], [], [], True)
+
+        self.assertRaises(omero.ValidationException, *bad_screen)
 
     # Helpers