diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AccessControlFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AccessControlFlows.kt
index ac27139bf3..d8bb349b07 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AccessControlFlows.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AccessControlFlows.kt
@@ -112,8 +112,9 @@ class CreateAccessControlPolicyResponder(val session: FlowSession) : FlowLogic<S
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
@@ -207,8 +208,9 @@ class UpdateAccessControlPolicyStateResponder(val session: FlowSession) : FlowLo
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
@@ -285,8 +287,9 @@ class DeleteAccessControlPolicyStateResponder(val session: FlowSession) : FlowLo
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCFlows.kt
index b1d9023d74..69dd715a72 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCFlows.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCFlows.kt
@@ -160,8 +160,9 @@ object LockAssetHTLC {
                     println("Issuer signed transaction.")
                     return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
                 } catch (e: Exception) {
-                    println("Error signing unlock asset transaction by Issuer: ${e.message}\n")
-                    return subFlow(ReceiveFinalityFlow(session))
+                    val errorMsg = "Error signing lock asset transaction: ${e.message}\n"
+                    println(errorMsg)
+                    throw Error(errorMsg)
                 }
             } else if (role == ResponderRole.RECIPIENT) {
               val signTransactionFlow = object : SignTransactionFlow(session) {
@@ -176,8 +177,9 @@ object LockAssetHTLC {
                   println("Recipient signed transaction.")
                   return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
               } catch (e: Exception) {
-                  println("Error signing unlock asset transaction by Recipient: ${e.message}\n")
-                  return subFlow(ReceiveFinalityFlow(session))
+                  val errorMsg = "Error signing lock asset transaction by Recipient: ${e.message}\n"
+                  println(errorMsg)
+                  throw Error(errorMsg)
               }
             } else if (role == ResponderRole.OBSERVER) {
                 val sTx = subFlow(ReceiveFinalityFlow(session, statesToRecord = StatesToRecord.ALL_VISIBLE))
@@ -447,8 +449,9 @@ object ClaimAssetHTLC {
                     println("Issuer signed transaction.")
                     return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
                 } catch (e: Exception) {
-                    println("Error signing claim asset transaction by issuer: ${e.message}\n")
-                    return subFlow(ReceiveFinalityFlow(session))
+                    val errorMsg = "Error signing claim asset transaction: ${e.message}\n"
+                    println(errorMsg)
+                    throw Error(errorMsg)
                 }
             } else if (role == ResponderRole.LOCKER) {
                 val sTx = subFlow(ReceiveFinalityFlow(session))
@@ -586,8 +589,9 @@ object UnlockAssetHTLC {
                     println("Issuer signed transaction.")
                     return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
                 } catch (e: Exception) {
-                    println("Error signing unlock asset transaction by Issuer: ${e.message}\n")
-                    return subFlow(ReceiveFinalityFlow(session))
+                    val errorMsg = "Error signing unlock asset transaction: ${e.message}\n"
+                    println(errorMsg)
+                    throw Error(errorMsg)
                 }
             } else if (role == ResponderRole.LOCKER) {
               val signTransactionFlow = object : SignTransactionFlow(session) {
@@ -603,8 +607,9 @@ object UnlockAssetHTLC {
                   println("Locker signed transaction.")
                   return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
               } catch (e: Exception) {
-                  println("Error signing unlock asset transaction by Locker: ${e.message}\n")
-                  return subFlow(ReceiveFinalityFlow(session))
+                  val errorMsg = "Error signing unlock asset transaction by Locker: ${e.message}\n"
+                  println(errorMsg)
+                  throw Error(errorMsg)
               }
             } else if (role == ResponderRole.RECIPIENT) {
                 val sTx = subFlow(ReceiveFinalityFlow(session))
diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferFlows.kt
index e080f51287..8d0dacfe24 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferFlows.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferFlows.kt
@@ -188,8 +188,9 @@ object PledgeAsset {
                     println("Issuer signed transaction.")
                     return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
                 } catch (e: Exception) {
-                    println("Error signing unlock asset transaction by Issuer: ${e.message}\n")
-                    return subFlow(ReceiveFinalityFlow(session))
+                    val errorMsg = "Error signing unlock asset transaction: ${e.message}\n"
+                    println(errorMsg)
+                    throw Error(errorMsg)
                 }
             } else if (role == AssetTransferResponderRole.OBSERVER) {
                 val sTx = subFlow(ReceiveFinalityFlow(session, statesToRecord = StatesToRecord.ALL_VISIBLE))
@@ -607,8 +608,9 @@ object ReclaimPledgedAsset {
                     println("Issuer signed transaction.")
                     return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
                 } catch (e: Exception) {
-                    println("Error signing reclaim asset transaction by Issuer: ${e.message}\n")
-                    return subFlow(ReceiveFinalityFlow(session))
+                    val errorMsg = "Error signing reclaim asset transaction: ${e.message}\n"
+                    println(errorMsg)
+                    throw Error(errorMsg)
                 }
             } else if (role == AssetTransferResponderRole.PLEDGER) {
                 val signTransactionFlow = object : SignTransactionFlow(session) {
@@ -624,8 +626,9 @@ object ReclaimPledgedAsset {
                     println("Locker signed transaction.")
                     return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
                 } catch (e: Exception) {
-                    println("Error signing reclaim asset transaction by Locker: ${e.message}\n")
-                    return subFlow(ReceiveFinalityFlow(session))
+                    val errorMsg = "Error signing reclaim asset transaction by Locker: ${e.message}\n"
+                    println(errorMsg)
+                    throw Error(errorMsg)
                 }
             } else if (role == AssetTransferResponderRole.OBSERVER) {
                 val sTx = subFlow(ReceiveFinalityFlow(session, statesToRecord = StatesToRecord.ALL_VISIBLE))
@@ -862,8 +865,9 @@ object ClaimRemoteAsset {
                     println("Party: ${ourIdentity} signed transaction.")
                     return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
                 } catch (e: Exception) {
-                    println("Error signing claim asset transaction by issuer: ${e.message}\n")
-                    return subFlow(ReceiveFinalityFlow(session))
+                    val errorMsg = "Error signing claim asset transaction: ${e.message}\n"
+                    println(errorMsg)
+                    throw Error(errorMsg)
                 }
             } else if (role == AssetTransferResponderRole.OBSERVER) {
                 val sTx = subFlow(ReceiveFinalityFlow(session, statesToRecord = StatesToRecord.ALL_VISIBLE))
diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/MembershipFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/MembershipFlows.kt
index 8eb9423cb5..89290eb9aa 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/MembershipFlows.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/MembershipFlows.kt
@@ -99,8 +99,9 @@ class CreateMembershipStateResponder(val session: FlowSession) : FlowLogic<Signe
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
@@ -188,8 +189,9 @@ class UpdateMembershipStateResponder(val session: FlowSession) : FlowLogic<Signe
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
@@ -265,8 +267,9 @@ class DeleteMembershipStateResponder(val session: FlowSession) : FlowLogic<Signe
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NetworkIdFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NetworkIdFlows.kt
index d5437cadc6..f7ea93831c 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NetworkIdFlows.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NetworkIdFlows.kt
@@ -138,8 +138,9 @@ class Acceptor(val session: FlowSession) : FlowLogic<SignedTransaction>() {
             println("Network member signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error signing create network id transaction by network member: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error signing create network id transaction by network member: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/VerificationPolicyFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/VerificationPolicyFlows.kt
index 2cd60b783c..ab995c03bc 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/VerificationPolicyFlows.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/VerificationPolicyFlows.kt
@@ -105,8 +105,9 @@ class CreateVerificationPolicyStateResponder(val session: FlowSession) : FlowLog
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
@@ -192,8 +193,9 @@ class UpdateVerificationPolicyStateResponder(val session: FlowSession) : FlowLog
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
@@ -270,8 +272,9 @@ class DeleteVerificationPolicyStateResponder(val session: FlowSession) : FlowLog
             println("${ourIdentity} signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error during transaction by ${ourIdentity}: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error during transaction by ${ourIdentity}: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt
index 3b170bf936..34dc878591 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt
@@ -132,8 +132,9 @@ class WriteExternalStateAcceptor(val session: FlowSession) : FlowLogic<SignedTra
             println("Issuer signed transaction.")
             return subFlow(ReceiveFinalityFlow(session, expectedTxId = txId))
         } catch (e: Exception) {
-            println("Error signing write external state transaction: ${e.message}\n")
-            return subFlow(ReceiveFinalityFlow(session))
+            val errorMsg = "Error signing write external state transaction: ${e.message}\n"
+            println(errorMsg)
+            throw Error(errorMsg)
         }
     }
 }
diff --git a/weaver/rfcs/models/security/confidentiality.md b/weaver/rfcs/models/security/confidentiality.md
index f0b7c4e371..836e7e8363 100644
--- a/weaver/rfcs/models/security/confidentiality.md
+++ b/weaver/rfcs/models/security/confidentiality.md
@@ -46,5 +46,5 @@ This protocol ensures confidentiality against potentially malicious relays and a
 There are different ways in which the above protocol can be realized, and these are listed and discussed in the [appendix](confidentiality-design-choices.md). We use [Protocol #5](./confidentiality-design-choices.md#protocol-5) in the above model, as it is the most secure and usable option, and this is implemented in Weaver as a reference.
 
 Additional notes:
-- Initially, Weaver will support encryption and decryption using [ECIES](https://github.com/ethereum/go-ethereum/tree/master/crypto/ecies) but other asymmetric key algorithms may be supported in the future, including with Ed25519 keys.
+- Initially, Weaver will support encryption and decryption using [ECIES](https://github.com/ethereum/go-ethereum/tree/v1.11.5/crypto/ecies) but other asymmetric key algorithms may be supported in the future, including with Ed25519 keys.
 - We can consider an alternative solution whereby even the applicaton client does not possess the private key, which instead is maintained by the interoperation module in the destination network. But this requires a private key to be disseminated to, and maintained in secondary storage by, multiple nodes. This is both logistically challenging and insecure; hence, we recommend the procedure describes above.