1 files changed, 4 insertions, 0 deletions
diff --git a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
index fd2ce609b8..f50ff01fc6 100644
--- a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
@@ -550,6 +550,10 @@ public class GeneratedPropertyContainer extends AbstractContainer implements
     @Override
     public Item getItem(Object itemId) {
         Item item = wrappedContainer.getItem(itemId);
+        if (item == null) {
+            return null;
+        }
+
         return createGeneratedPropertyItem(itemId, item);
     }