diff --git a/api/src/main/java/com/lantanagroup/link/api/controller/PatientIdentifierController.java b/api/src/main/java/com/lantanagroup/link/api/controller/PatientIdentifierController.java
index a98028f61..bbadb3291 100644
--- a/api/src/main/java/com/lantanagroup/link/api/controller/PatientIdentifierController.java
+++ b/api/src/main/java/com/lantanagroup/link/api/controller/PatientIdentifierController.java
@@ -106,6 +106,14 @@ public void savePatientList(@RequestBody String patientList,
                               @RequestParam String periodStart,
                               @RequestParam String periodEnd) {
     TenantService tenantService = TenantService.create(this.sharedService, tenantId);
+
+    if (tenantService == null) {
+      throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Tenant not found");
+    }
+    if (!this.sharedService.measureDefinitionExists(measureId)) {
+      throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Measure not found");
+    }
+
     List<String> patientIds = Arrays.asList(patientList.replace("\r", "").split("\n"));
     PatientList list = new PatientList();
     list.setMeasureId(measureId);