diff --git a/javers-core/src/main/java/org/javers/common/collections/Lists.java b/javers-core/src/main/java/org/javers/common/collections/Lists.java
index f452837c1..de70591c5 100644
--- a/javers-core/src/main/java/org/javers/common/collections/Lists.java
+++ b/javers-core/src/main/java/org/javers/common/collections/Lists.java
@@ -16,7 +16,7 @@
 public class Lists {
 
     public static List wrapNull(Object list) {
-        if (list == null || list == MissingProperty.INSTANCE) {
+        if (list == null || list == MissingProperty.INSTANCE || !(list instanceof List)) {
             return Collections.emptyList();
         }
         return (List)list;
diff --git a/javers-core/src/main/java/org/javers/common/collections/Maps.java b/javers-core/src/main/java/org/javers/common/collections/Maps.java
index df04bce86..01f496cea 100644
--- a/javers-core/src/main/java/org/javers/common/collections/Maps.java
+++ b/javers-core/src/main/java/org/javers/common/collections/Maps.java
@@ -13,7 +13,7 @@
 public class Maps {
 
     public static Map wrapNull(Object map){
-        if (map == null || map == MissingProperty.INSTANCE){
+        if (map == null || map == MissingProperty.INSTANCE || !(map instanceof Map)){
             return Collections.emptyMap();
         }
         return (Map)map;
diff --git a/javers-core/src/main/java/org/javers/common/collections/Sets.java b/javers-core/src/main/java/org/javers/common/collections/Sets.java
index 60dcb439b..b4873e764 100644
--- a/javers-core/src/main/java/org/javers/common/collections/Sets.java
+++ b/javers-core/src/main/java/org/javers/common/collections/Sets.java
@@ -21,7 +21,7 @@ private Sets() {
 
 
     public static Set wrapNull(Object set) {
-        if (set == null || set == MissingProperty.INSTANCE) {
+        if (set == null || set == MissingProperty.INSTANCE || !(set instanceof Set)) {
             return Collections.emptySet();
         }
         return (Set) set;