diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs
index 2ec36558..8e9a2df4 100644
--- a/server/AyaNova/biz/ContractBiz.cs
+++ b/server/AyaNova/biz/ContractBiz.cs
@@ -146,6 +146,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Contract dbObject = await ct.Contract.SingleOrDefaultAsync(m => m.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs
index 9a17ba09..dd80af18 100644
--- a/server/AyaNova/biz/CustomerBiz.cs
+++ b/server/AyaNova/biz/CustomerBiz.cs
@@ -151,6 +151,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Customer dbObject = await ct.Customer.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     await ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/CustomerNoteBiz.cs b/server/AyaNova/biz/CustomerNoteBiz.cs
index fb15e1bc..ac37a31b 100644
--- a/server/AyaNova/biz/CustomerNoteBiz.cs
+++ b/server/AyaNova/biz/CustomerNoteBiz.cs
@@ -116,7 +116,10 @@ namespace AyaNova.Biz
                 try
                 {
                     CustomerNote dbObject = await ct.CustomerNote.SingleOrDefaultAsync(m => m.Id == id);
-                    // ValidateCanDelete(dbObject);
+                    if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     if (HasErrors)
                         return false;
                     if (HasErrors)
diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs
index 52eeb2d6..a8e9e849 100644
--- a/server/AyaNova/biz/HeadOfficeBiz.cs
+++ b/server/AyaNova/biz/HeadOfficeBiz.cs
@@ -151,6 +151,10 @@ namespace AyaNova.Biz
                 try
                 {
                     HeadOffice dbObject = await ct.HeadOffice.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/LoanUnitBiz.cs b/server/AyaNova/biz/LoanUnitBiz.cs
index 3e6b62cb..af9621aa 100644
--- a/server/AyaNova/biz/LoanUnitBiz.cs
+++ b/server/AyaNova/biz/LoanUnitBiz.cs
@@ -146,6 +146,10 @@ namespace AyaNova.Biz
                 try
                 {
                     LoanUnit dbObject = await ct.LoanUnit.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/NotifySubscriptionBiz.cs b/server/AyaNova/biz/NotifySubscriptionBiz.cs
index 86a73501..f1841457 100644
--- a/server/AyaNova/biz/NotifySubscriptionBiz.cs
+++ b/server/AyaNova/biz/NotifySubscriptionBiz.cs
@@ -142,6 +142,10 @@ namespace AyaNova.Biz
                 try
                 {
                     NotifySubscription dbObject = await ct.NotifySubscription.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     //ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/PMTemplateBiz.cs b/server/AyaNova/biz/PMTemplateBiz.cs
index 9f78259f..0aa40eef 100644
--- a/server/AyaNova/biz/PMTemplateBiz.cs
+++ b/server/AyaNova/biz/PMTemplateBiz.cs
@@ -161,6 +161,10 @@ namespace AyaNova.Biz
                 try
                 {
                     PMTemplate dbObject = await ct.PMTemplate.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/PartBiz.cs b/server/AyaNova/biz/PartBiz.cs
index 8ba89af2..f48b342c 100644
--- a/server/AyaNova/biz/PartBiz.cs
+++ b/server/AyaNova/biz/PartBiz.cs
@@ -146,6 +146,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Part dbObject = await ct.Part.SingleOrDefaultAsync(m => m.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/ProjectBiz.cs b/server/AyaNova/biz/ProjectBiz.cs
index 6e3e7e73..412c01e3 100644
--- a/server/AyaNova/biz/ProjectBiz.cs
+++ b/server/AyaNova/biz/ProjectBiz.cs
@@ -146,6 +146,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Project dbObject = await ct.Project.SingleOrDefaultAsync(m => m.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs
index d7ec289b..89e35b61 100644
--- a/server/AyaNova/biz/PurchaseOrderBiz.cs
+++ b/server/AyaNova/biz/PurchaseOrderBiz.cs
@@ -146,6 +146,10 @@ namespace AyaNova.Biz
                 try
                 {
                     PurchaseOrder dbObject = await ct.PurchaseOrder.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs
index 64468370..1bd9477b 100644
--- a/server/AyaNova/biz/ReportBiz.cs
+++ b/server/AyaNova/biz/ReportBiz.cs
@@ -206,6 +206,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Report dbObject = await ct.Report.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     await ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs
index dd69c5f8..5ec0c398 100644
--- a/server/AyaNova/biz/UnitBiz.cs
+++ b/server/AyaNova/biz/UnitBiz.cs
@@ -146,6 +146,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Unit dbObject = await ct.Unit.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/UnitModelBiz.cs b/server/AyaNova/biz/UnitModelBiz.cs
index 2411ad84..f80db5d4 100644
--- a/server/AyaNova/biz/UnitModelBiz.cs
+++ b/server/AyaNova/biz/UnitModelBiz.cs
@@ -146,6 +146,10 @@ namespace AyaNova.Biz
                 try
                 {
                     UnitModel dbObject = await ct.UnitModel.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs
index ca7b32d1..11be408a 100644
--- a/server/AyaNova/biz/UserBiz.cs
+++ b/server/AyaNova/biz/UserBiz.cs
@@ -448,8 +448,11 @@ namespace AyaNova.Biz
                 try
                 {
                     User dbObject = await ct.User.SingleOrDefaultAsync(z => z.Id == id);
-                    if (dbObject == null)
+                    if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
                         return false;
+                    }
+                        
 
                     //Also used for Contacts (customer type user or ho type user)
                     //by users with no User right but with Customer rights so need to double check here
diff --git a/server/AyaNova/biz/VendorBiz.cs b/server/AyaNova/biz/VendorBiz.cs
index 29cf84ee..d96ed3c3 100644
--- a/server/AyaNova/biz/VendorBiz.cs
+++ b/server/AyaNova/biz/VendorBiz.cs
@@ -152,6 +152,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Vendor dbObject = await ct.Vendor.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index 54e00fc7..c3537a7d 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -154,6 +154,10 @@ namespace AyaNova.Biz
                 try
                 {
                     Widget dbObject = await ct.Widget.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     ValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 820dd653..b62bfc3c 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -199,6 +199,10 @@ namespace AyaNova.Biz
                 try
                 {
                     WorkOrder dbObject = await ct.WorkOrder.SingleOrDefaultAsync(z => z.Id == id);
+                     if (dbObject == null){
+                        AddError(ApiErrorCode.NOT_FOUND);
+                        return false;
+                    }
                     WorkOrderValidateCanDelete(dbObject);
                     if (HasErrors)
                         return false;