AxonFramework
diff --git a/Collapse file
‎messaging/src/main/java/org/axonframework/commandhandling/gateway/ConvertingCommandGateway.java‎
Copy file name to clipboardExpand all lines: messaging/src/main/java/org/axonframework/commandhandling/gateway/ConvertingCommandGateway.java
+3-1Lines changed: 3 additions & 1 deletion b/Collapse file
‎messaging/src/main/java/org/axonframework/commandhandling/gateway/ConvertingCommandGateway.java‎
Copy file name to clipboardExpand all lines: messaging/src/main/java/org/axonframework/commandhandling/gateway/ConvertingCommandGateway.java
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/Collapse file
‎messaging/src/test/java/org/axonframework/commandhandling/gateway/ConvertingCommandGatewayTest.java‎
Copy file name to clipboardExpand all lines: messaging/src/test/java/org/axonframework/commandhandling/gateway/ConvertingCommandGatewayTest.java
+13Lines changed: 13 additions & 0 deletions b/Collapse file
‎messaging/src/test/java/org/axonframework/commandhandling/gateway/ConvertingCommandGatewayTest.java‎
Copy file name to clipboardExpand all lines: messaging/src/test/java/org/axonframework/commandhandling/gateway/ConvertingCommandGatewayTest.java
+13Lines changed: 13 additions & 0 deletions
@@ -86,7 +86,9 @@ public CompletableFuture<? extends Message> getResultMessage() {
         @Override
         public <R> CompletableFuture<R> resultAs(@Nonnull Class<R> type) {
             return delegate.getResultMessage()
-                           .thenApply(resultMessage -> resultMessage.payloadAs(type, commandConverter));
+                           .thenApply(resultMessage -> resultMessage != null
+                                   ? resultMessage.payloadAs(type, commandConverter)
+                                   : null);
         }
 
         @Override
 
@@ -16,6 +16,7 @@
 
 package org.axonframework.commandhandling.gateway;
 
+import org.axonframework.common.FutureUtils;
 import org.axonframework.messaging.GenericMessage;
 import org.axonframework.messaging.Message;
 import org.axonframework.messaging.conversion.MessageConverter;
@@ -120,4 +121,16 @@ void onSuccessCallbackIsInvokedWhenFutureCompletes() {
         assertTrue(actual.isDone());
         assertTrue(invoked.get());
     }
+
+    @Test
+    void resultAsReturnsNullWhenMessageIsNull() {
+        CommandResult stubResult = new FutureCommandResult(FutureUtils.emptyCompletedFuture());
+        when(mockDelegate.send(any(), any())).thenReturn(stubResult);
+
+        when(mockConverter.convert(any(), eq((Type) byte[].class))).thenReturn(HELLO_BYTES);
+
+        CompletableFuture<byte[]> actual = testSubject.send("Test", null).resultAs(byte[].class);
+        assertTrue(actual.isDone());
+        assertNull(actual.join());
+    }
 }