diff --git a/framework/src/play-test/src/main/java/play/test/Helpers.java b/framework/src/play-test/src/main/java/play/test/Helpers.java
index <HASH>..<HASH> 100644
--- a/framework/src/play-test/src/main/java/play/test/Helpers.java
+++ b/framework/src/play-test/src/main/java/play/test/Helpers.java
@@ -57,7 +57,7 @@ public class Helpers implements play.mvc.Http.Status, play.mvc.Http.HeaderNames 
 
     private static Promise<Result> wrapScalaResult(scala.concurrent.Future<play.api.mvc.Result> result) {
         if (result == null) {
-            return null;
+            return Promise.pure(null);
         } else {
             return Promise.wrap(result).map(
                 new Function<play.api.mvc.Result, Result>() {
Fix NPE caused by Java test helper routeAsync changes