1 files changed, 2 insertions, 2 deletions
diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper2_0.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper2_0.java
index 2b9204c9..53388f67 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper2_0.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper2_0.java
@@ -210,8 +210,8 @@ public class Mapper2_0 implements Mapper<BaseRequest,CertInfo,Artifacts,Error> {
             ArtiDAO.Data data = new ArtiDAO.Data();
             data.mechid = trim(arti.getMechid());
             data.machine = trim(arti.getMachine());
-            Set<String> ss = data.type(true);
             if(arti.getType()!=null) {
+                Set<String> ss = data.type(true);
 	            for(String t : arti.getType()) {
 	            	ss.add(t.trim());
 	            }
@@ -228,8 +228,8 @@ public class Mapper2_0 implements Mapper<BaseRequest,CertInfo,Artifacts,Error> {
             // Ignored on way in for create/update
             data.sponsor = trim(arti.getSponsor());
             data.expires = null;
-            ss = data.sans(true);
             if(arti.getSans()!=null) {
+              Set<String> ss = data.sans(true);
               for(String s : arti.getSans()) {
             	  ss.add(s.trim());
               }