diff --git a/node/src/main/kotlin/com/r3corda/node/driver/Driver.kt b/node/src/main/kotlin/com/r3corda/node/driver/Driver.kt
index 466aa76b2d..e8abaaa2ec 100644
--- a/node/src/main/kotlin/com/r3corda/node/driver/Driver.kt
+++ b/node/src/main/kotlin/com/r3corda/node/driver/Driver.kt
@@ -309,9 +309,9 @@ open class DriverDSL(
                 )
         )
 
-        return Executors.newSingleThreadExecutor().submit(Callable<NodeInfo> {
+        return Executors.newSingleThreadExecutor().submit(Callable<DriverNodeInfo> {
             registerProcess(DriverDSL.startNode(config, quasarJarPath, debugPort))
-            queryNodeInfo(apiAddress)!!
+            DriverNodeInfo(queryNodeInfo(apiAddress)!!, messagingAddress, apiAddress)
         })
     }