diff --git a/EgwCoreLib.Lux.Data/Repository/Job/JobStepRepository.cs b/EgwCoreLib.Lux.Data/Repository/Job/JobStepRepository.cs
index a25edd7e..3059ab1b 100644
--- a/EgwCoreLib.Lux.Data/Repository/Job/JobStepRepository.cs
+++ b/EgwCoreLib.Lux.Data/Repository/Job/JobStepRepository.cs
@@ -24,6 +24,9 @@ namespace EgwCoreLib.Lux.Data.Repository.Job
 
         public async Task<bool> DeleteAsync(JobStepModel rec2del)
         {
+            // Add validation for null entity
+            if (rec2del == null) return false;
+
             await using var dbCtx = await CreateContextAsync();
 
             // Wrap in transaction for atomicity (multi-row update + delete)
@@ -84,6 +87,9 @@ namespace EgwCoreLib.Lux.Data.Repository.Job
 
         public async Task<bool> MoveAsync(JobStepModel selRec, bool moveUp)
         {
+            // Add validation for null entity
+            if (selRec == null) return false;
+
             await using var dbCtx = await CreateContextAsync();
 
             // Wrap in transaction for atomicity (multi-row update)
diff --git a/EgwCoreLib.Lux.Data/Repository/Job/JobTaskRepository.cs b/EgwCoreLib.Lux.Data/Repository/Job/JobTaskRepository.cs
index ba522535..ae2e749c 100644
--- a/EgwCoreLib.Lux.Data/Repository/Job/JobTaskRepository.cs
+++ b/EgwCoreLib.Lux.Data/Repository/Job/JobTaskRepository.cs
@@ -24,6 +24,9 @@ namespace EgwCoreLib.Lux.Data.Repository.Job
 
         public async Task<bool> DeleteAsync(JobTaskModel rec2del)
         {
+            // Add validation for null entity
+            if (rec2del == null) return false;
+
             await using var dbCtx = await CreateContextAsync();
 
             // Wrap in transaction for atomicity (multi-row update + delete)
@@ -135,6 +138,9 @@ namespace EgwCoreLib.Lux.Data.Repository.Job
 
         public async Task<bool> MoveAsync(JobTaskModel selRec, bool moveUp)
         {
+            // Add validation for null entity
+            if (selRec == null) return false;
+
             await using var dbCtx = await CreateContextAsync();
 
             // Wrap in transaction for atomicity (multi-row update)
diff --git a/EgwCoreLib.Lux.Data/Repository/Utils/GenClassRepository.cs b/EgwCoreLib.Lux.Data/Repository/Utils/GenClassRepository.cs
index 6c1c0e2b..48ae39c7 100644
--- a/EgwCoreLib.Lux.Data/Repository/Utils/GenClassRepository.cs
+++ b/EgwCoreLib.Lux.Data/Repository/Utils/GenClassRepository.cs
@@ -23,9 +23,15 @@ namespace EgwCoreLib.Lux.Data.Repository.Utils
 
         public async Task<bool> DeleteAsync(GenClassModel entity)
         {
+            // Add validation for null entity
+            if (entity == null) return false;
+
             await using var dbCtx = await CreateContextAsync();
             dbCtx.DbSetGenClass.Remove(entity);
-            return await dbCtx.SaveChangesAsync() > 0;
+            
+            bool done = await dbCtx.SaveChangesAsync() > 0;
+            
+            return done;
         }
 
 
diff --git a/EgwCoreLib.Lux.Data/Repository/Utils/GenValRepository.cs b/EgwCoreLib.Lux.Data/Repository/Utils/GenValRepository.cs
index 9a1e9cba..49927e47 100644
--- a/EgwCoreLib.Lux.Data/Repository/Utils/GenValRepository.cs
+++ b/EgwCoreLib.Lux.Data/Repository/Utils/GenValRepository.cs
@@ -24,6 +24,9 @@ namespace EgwCoreLib.Lux.Data.Repository.Utils
 
         public async Task<bool> DeleteAsync(GenValueModel rec2del)
         {
+            // Add validation for null entity
+            if (rec2del == null) return false;
+
             await using var dbCtx = await CreateContextAsync();
 
             // Wrap in transaction for atomicity (multi-row update + delete)
@@ -83,6 +86,9 @@ namespace EgwCoreLib.Lux.Data.Repository.Utils
 
         public async Task<bool> MoveAsync(GenValueModel selRec, bool moveUp)
         {
+            // Add validation for null entity
+            if (selRec == null) return false;
+
             await using var dbCtx = await CreateContextAsync();
 
             // Wrap in transaction for atomicity (multi-row update - swap positions)