X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FMR_ClusterService.java;h=ed572791bc08a0cec47b63de144fc42f9eb69d70;hp=2dae57990348bc8c279b3d9f88edb106ce94900a;hb=f595e173fdb3921cb6c6855f5389871ee3c3ada3;hpb=8f54f37825746cf82b33a21ff356950eb682d290

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
index 2dae579..ed57279 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
@@ -77,8 +77,12 @@ public class MR_ClusterService extends BaseLoggingClass {
 		DcaeLocationService locations = new DcaeLocationService();
 		List<MR_Cluster> result = new ArrayList<MR_Cluster>();
 		for( MR_Cluster c: mr_clusters.values() ) {
-			if ( locations.getDcaeLocation(c.getDcaeLocationName()).isCentral() ) {
-				result.add(c);
+			try {
+				if ( locations.getDcaeLocation(c.getDcaeLocationName()).isCentral() ) {
+					result.add(c);
+				}
+			} catch ( NullPointerException npe ) {
+				logger.warn( "Failed test isCentral for location:" + c.getDcaeLocationName() );
 			}
 		}
 		return result;