1 files changed, 2 insertions, 2 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
index 2b23c52cd0..d0a1273210 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
@@ -58,9 +58,9 @@ public class ArtifactResolverImpl implements ArtifactsResolver {
         if (MapUtils.isNotEmpty(interfaces)) {
             interfaceArtifacts = interfaces.values().stream()
                     .flatMap(inte -> inte.getOperationsMap().values().stream())
-                    .map(operation -> operation.getImplementationArtifact())
+                    .map(operation -> operation.getImplementationArtifact()).filter(Objects::nonNull)
                     .collect(Collectors.toMap(artifactDefinition -> artifactDefinition.getUniqueId(),
-                            artifactDefinition -> artifactDefinition));
+                            artifactDefinition -> artifactDefinition, (a1, a2) -> a1));
         }
 
         Map<String, ArtifactDefinition> serviceApiArtifacts = Collections.emptyMap();