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);
 			}
 		}