diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
index 01ec1566..c12330f9 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
@@ -156,7 +156,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                         &&
                         (string.IsNullOrEmpty(req.disciplinaryFaultLevel) || x.DisciplinaryFaultLevel == req.disciplinaryFaultLevel)
                         &&
-                        (string.IsNullOrEmpty(req.disciplinaryCaseFault) || x.DisciplinaryCaseFault.Contains(req.disciplinaryCaseFault))
+                        (string.IsNullOrEmpty(req.disciplinaryCaseFault) || (x.DisciplinaryCaseFault?.Contains(req.disciplinaryCaseFault) ?? false))
                     )
                     .ToList();
             }
diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
index f060ae84..f09ac093 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
@@ -175,13 +175,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                         &&
                         (string.IsNullOrEmpty(req.disciplinaryFaultLevel) || x.DisciplinaryFaultLevel == req.disciplinaryFaultLevel)
                         &&
-                        (string.IsNullOrEmpty(req.disciplinaryCaseFault) || x.DisciplinaryCaseFault.Contains(req.disciplinaryCaseFault))
+                        (string.IsNullOrEmpty(req.disciplinaryCaseFault) || (x.DisciplinaryCaseFault?.Contains(req.disciplinaryCaseFault) ?? false))
                          &&
-                        (string.IsNullOrEmpty(req.resultDisciplineType) || x.ResultDisciplineType.Contains(req.resultDisciplineType))
+                        (string.IsNullOrEmpty(req.resultDisciplineType) || (x.ResultDisciplineType?.Contains(req.resultDisciplineType) ?? false))
                          &&
-                        (string.IsNullOrEmpty(req.resultTitleType) || x.ResultTitleType.Contains(req.resultTitleType))
+                        (string.IsNullOrEmpty(req.resultTitleType) || (x.ResultTitleType?.Contains(req.resultTitleType) ?? false))
                          &&
-                        (string.IsNullOrEmpty(req.resultOc) || x.ResultOc.Contains(req.resultOc))
+                        (string.IsNullOrEmpty(req.resultOc) || (x.ResultOc?.Contains(req.resultOc) ?? false))
                          &&
                         (!req.resultYear.HasValue || x.ResultYear == req.resultYear)
                     )