From 0e5e23faeb313e87c7cf611346eeb2662b501c29 Mon Sep 17 00:00:00 2001
From: Cosmin <cioan@pih.org>
Date: Wed, 5 May 2021 10:51:06 -0400
Subject: [PATCH] TRUNK-6003: Make getLocationsByTag method null safe (#3768)

---
 api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
index b69676ee9ef4..0d1a941c513f 100644
--- a/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
+++ b/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
@@ -207,7 +207,7 @@ public List<Location> getLocationsByTag(LocationTag tag) throws APIException {
 		List<Location> locations = new ArrayList<>();
 		
 		for (Location l : dao.getAllLocations(false)) {
-			if (l.getTags().contains(tag)) {
+			if (l.getTags() != null && l.getTags().contains(tag)) {
 				locations.add(l);
 			}
 		}