1 files changed, 5 insertions, 2 deletions
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
index 05f2070..74b1bac 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Verify the CSAR package by following the SOL004 specifications and ONAP VNFREQS for TOSCA.
@@ -782,11 +783,13 @@ public class CSARArchive implements AutoCloseable {
         }
 
         public Map<String, Map<String, List<String>>> getNonMano() {
-            return nonMano;
+            return Map.copyOf(nonMano);
         }
 
         public void setNonMano(Map<String, Map<String, List<String>>> nonMano) {
-            this.nonMano = nonMano;
+            this.nonMano = nonMano.entrySet().stream()
+                .filter(mapEntry -> mapEntry.getKey() != null && mapEntry.getValue() != null)
+                .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
             this.isNonManoAvailable = true;
         }