diff --git a/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultObserverExceptionTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultObserverExceptionTest.kt
index 93bb394416..c88147d684 100644
--- a/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultObserverExceptionTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/vault/VaultObserverExceptionTest.kt
@@ -750,7 +750,7 @@ class VaultObserverExceptionTest {
 
             val future = aliceNode.rpc.startFlow(ErrorHandling::SubscribingRawUpdatesFlow).returnValue
 
-            assertFailsWith<CordaRuntimeException>("Cannot subscribe to NodeVaultService.rawUpdates from a flow!") {
+            assertFailsWith<CordaRuntimeException>("Flow tried to subscribe an Rx.Observer to VaultService.rawUpdates - the subscription did not succeed ") {
                 future.getOrThrow(30.seconds)
             }
         }
@@ -758,7 +758,7 @@ class VaultObserverExceptionTest {
 
     //TODO add retry from checkpoint test
     @Test
-    fun `Failing Observer wrapped with FlowSafeSubscriber will remain and re-called upon flow retry`() {
+    fun `Failing Observer wrapped with FlowSafeSubscriber will survive and be re-called upon flow retry`() {
 
     }
 
diff --git a/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt b/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
index 4d0555bf78..486f3a45b1 100644
--- a/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
+++ b/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
@@ -217,10 +217,12 @@ class NodeVaultService(
                 // flow's properties, essentially to fiber's properties then, since it does not unsubscribes on flow's/ fiber's completion,
                 // it could prevent the flow/ fiber swapped our of memory.
                 PreventSubscriptionsSubject(_rawUpdatesPublisher) {
-                    log.error("Cannot subscribe to NodeVaultService.rawUpdates from a flow! " +
+                    log.error("Flow tried to subscribe an Rx.Observer to VaultService.rawUpdates " +
+                            "- the subscription did not succeed " +
                             "- aborting the flow ")
 
-                    throw FlowException("Cannot subscribe to NodeVaultService.rawUpdates from a flow! ")
+                    throw FlowException("Flow tried to subscribe an Rx.Observer to VaultService.rawUpdates " +
+                            "- the subscription did not succeed ")
                 }
             } else {
                 // we are not inside a flow; we are most likely inside a CordaService,