From f74c297d52ca8f4d848856142987ba64f10f85b7 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <itsgabelyons@gmail.com>
Date: Tue, 2 Nov 2021 17:33:52 -0700
Subject: [PATCH] fix(aspects): fix null aspects case (#3501)

---
 .../com/linkedin/datahub/graphql/types/aspect/AspectType.java | 4 ++++
 1 file changed, 4 insertions(+)

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 fe925663c52266..c41214abe9ff7c 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 List<DataFetcherResult<Aspect>> batchLoad(@Nonnull List<VersionedAspectKe
       return keys.stream().map(key -> {
         try {
           VersionedAspect entity = _entityClient.getAspect(key.getUrn(), key.getAspectName(), key.getVersion(), context.getActor());
+          if (entity == null) {
+            return DataFetcherResult.<Aspect>newResult().data(null).build();
+          }
+
           return DataFetcherResult.<Aspect>newResult().data(AspectMapper.map(entity)).build();
         } catch (RemoteInvocationException e) {
           if (e instanceof RestLiResponseException) {