diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs
index fa611b50..695138a0 100644
--- a/server/AyaNova/biz/UnitBiz.cs
+++ b/server/AyaNova/biz/UnitBiz.cs
@@ -398,7 +398,8 @@ namespace AyaNova.Biz
                     if (await dr.ReadAsync())
                     {
                         o.LastWorkOrderViz = dr.GetInt64(0);
-                        o.LastServiceDateViz = dr.GetDateTime(1);
+                        if (!await dr.IsDBNullAsync(1))//case 4582
+                            o.LastServiceDateViz = dr.GetDateTime(1);
                     }
 
 
@@ -417,7 +418,8 @@ namespace AyaNova.Biz
                     if (await dr.ReadAsync())
                     {
                         o.LastWorkOrderCompletedViz = dr.GetInt64(0);
-                        o.LastServiceDateCompletedViz = dr.GetDateTime(1);
+                        if (!await dr.IsDBNullAsync(1))//case 4582
+                            o.LastServiceDateCompletedViz = dr.GetDateTime(1);
                     }