diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/aspect/AspectType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/aspect/AspectType.java index fe925663c5..c41214abe9 100644 --- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/aspect/AspectType.java +++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/aspect/AspectType.java @@ -31,6 +31,10 @@ public class AspectType { return keys.stream().map(key -> { try { VersionedAspect entity = _entityClient.getAspect(key.getUrn(), key.getAspectName(), key.getVersion(), context.getActor()); + if (entity == null) { + return DataFetcherResult.newResult().data(null).build(); + } + return DataFetcherResult.newResult().data(AspectMapper.map(entity)).build(); } catch (RemoteInvocationException e) { if (e instanceof RestLiResponseException) {