1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientEligibleTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientEligibleTrial.scala
index 5df5253..c0ead6f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientEligibleTrial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientEligibleTrial.scala
@@ -23,12 +23,9 @@ object PatientCriterion {
       case None                              => None
       case Some(FuzzyValue.Maybe)            => Some(FuzzyValue.Maybe)
       case Some(_) if criterionValue.isEmpty => Some(FuzzyValue.Maybe)
-      case Some(status) =>
-        Some(
-          FuzzyValue.fromBoolean(
-            FuzzyValue.fromBoolean(
-              criterionValue.getOrElse(throw new IllegalArgumentException("Criterion should not be empty"))) == status
-          ))
+      case Some(status) => Some(FuzzyValue.fromBoolean(
+        FuzzyValue.fromBoolean(criterionValue.get) == status
+      ))
     }
   }