1 files changed, 4 insertions, 1 deletions
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java
index 80adeb6e2a..fd7c1043e8 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/ConfigurationManager.java
@@ -112,10 +112,13 @@ public class ConfigurationManager {
   public String[] getAddresses() {
 
     String addresses = System.getProperty(CASSANDRA_ADDRESSES);
-    if (Objects.isNull(addresses)) {
+    if (Objects.nonNull(addresses)) {
       return addresses.split(",");
     }
     List lsAddresses = (ArrayList) cassandraConfiguration.get(CASSANDRA_HOSTS_KEY);
+    if (Objects.isNull(addresses) || addresses.length() == 0) {
+      throw new RuntimeException("Missing Cassandra hose.Cassandra host missing is mandatory.");
+    }
     String[] addressesArray;
     addressesArray = (String[]) lsAddresses.toArray(new String[lsAddresses.size()]);
     return addressesArray;