diff --git a/Marr.Data/Mapping/MappingHelper.cs b/Marr.Data/Mapping/MappingHelper.cs
index ea4b9bb4c..5d25aaffe 100644
--- a/Marr.Data/Mapping/MappingHelper.cs
+++ b/Marr.Data/Mapping/MappingHelper.cs
@@ -58,7 +58,7 @@ namespace Marr.Data.Mapping
                         dbValue = dataMap.Converter.FromDB(dataMap, dbValue);
                     }
 
-                    if (dbValue != DBNull.Value)
+                    if (dbValue != DBNull.Value && dbValue != null)
                     {
                         dataMap.Setter(ent, dbValue);
                     }