1 files changed, 6 insertions, 2 deletions
diff --git a/infra/rpc/impl/src/main/java/io/fd/honeycomb/rpc/HoneycombDOMRpcService.java b/infra/rpc/impl/src/main/java/io/fd/honeycomb/rpc/HoneycombDOMRpcService.java
index 68f29f208..01adbd6da 100644
--- a/infra/rpc/impl/src/main/java/io/fd/honeycomb/rpc/HoneycombDOMRpcService.java
+++ b/infra/rpc/impl/src/main/java/io/fd/honeycomb/rpc/HoneycombDOMRpcService.java
@@ -71,8 +71,12 @@ public final class HoneycombDOMRpcService implements DOMRpcService {
     private ListenableFuture<DOMRpcResult> getDOMRpcResult(final ListenableFuture<DataObject> invoke) {
         return Futures.transform(
             invoke,
-            (Function<DataObject, DOMRpcResult>) output -> {
-                final ContainerNode outputNode = serializer.toNormalizedNodeRpcData(output);
+            output -> {
+                // If result is available convert it to BI form. Otherwise pass null as DOMRpcResult expects.
+                ContainerNode outputNode = null;
+                if (output != null) {
+                    outputNode = serializer.toNormalizedNodeRpcData(output);
+                }
                 return new DefaultDOMRpcResult(outputNode);
             });
     }