1 files changed, 17 insertions, 0 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java
index 0b7e523813..8ed256c555 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java
@@ -21,6 +21,7 @@
 package org.openecomp.sdc.be.model;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -67,6 +68,14 @@ public class ComponentInstance extends ComponentInstanceDataDefinition implement
 		return deploymentArtifacts;
 	}
 
+	public Map<String, ArtifactDefinition> safeGetDeploymentArtifacts() {
+		return deploymentArtifacts == null ? Collections.EMPTY_MAP : deploymentArtifacts;
+	}
+
+	public Map<String, ArtifactDefinition> safeGetInformationalArtifacts() {
+		return artifacts == null ? Collections.EMPTY_MAP : deploymentArtifacts;
+	}
+
 	public void setDeploymentArtifacts(Map<String, ArtifactDefinition> deploymentArtifacts) {
 		this.deploymentArtifacts = deploymentArtifacts;
 	}
@@ -75,6 +84,10 @@ public class ComponentInstance extends ComponentInstanceDataDefinition implement
 		return artifacts;
 	}
 
+	public Map<String, ArtifactDefinition> safeGetArtifacts() {
+		return artifacts == null ? Collections.EMPTY_MAP : artifacts;
+	}
+
 	public void setArtifacts(Map<String, ArtifactDefinition> artifacts) {
 		this.artifacts = artifacts;
 	}
@@ -86,5 +99,9 @@ public class ComponentInstance extends ComponentInstanceDataDefinition implement
 	public void setGroupInstances(List<GroupInstance> groupInstances) {
 		this.groupInstances = groupInstances;
 	}
+
+	public String getActualComponentUid() {
+		return getIsProxy() ? getSourceModelUid() : getComponentUid();
+	}
 	
 }