diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
index 1d30fbfe6..20f1796a0 100644
--- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
+++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
@@ -94,7 +94,7 @@ protected MeasureReport evaluateMeasure(
 
         var evalType = MeasureEvalType.fromCode(reportType)
                 .orElse(
-                        subjectIds.get(0) == null || subjectIds == null || subjectIds.isEmpty()
+                        subjectIds == null || subjectIds.isEmpty() || subjectIds.get(0) == null
                                 ? MeasureEvalType.POPULATION
                                 : MeasureEvalType.SUBJECT);
 
diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
index a9d8d844f..b8b7bcfd5 100644
--- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
+++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
@@ -85,7 +85,7 @@ protected MeasureReport evaluateMeasure(
 
         var evalType = MeasureEvalType.fromCode(reportType)
                 .orElse(
-                        subjectIds.get(0) == null || subjectIds == null || subjectIds.isEmpty()
+                        subjectIds == null || subjectIds.isEmpty() || subjectIds.get(0) == null
                                 ? MeasureEvalType.POPULATION
                                 : MeasureEvalType.SUBJECT);