diff --git a/nitro.nimble b/nitro.nimble
index a78502e..59c079d 100644
--- a/nitro.nimble
+++ b/nitro.nimble
@@ -6,6 +6,7 @@ description = "Nitro state channels"
 requires "nim >= 1.2.6 & < 2.0.0"
 requires "nimcrypto >= 0.5.4 & < 0.6.0"
 requires "questionable >= 0.4.3 & < 0.5.0"
+requires "upraises >= 0.1.0 & < 0.2.0"
 requires "secp256k1"
 requires "stint"
 requires "stew"
diff --git a/nitro/basics.nim b/nitro/basics.nim
index b052b97..3db10c0 100644
--- a/nitro/basics.nim
+++ b/nitro/basics.nim
@@ -1,5 +1,6 @@
 import pkg/questionable
 import pkg/questionable/results
+import pkg/upraises
 import pkg/stint
 import ./basics/uint48
 import ./basics/ethaddress
@@ -7,6 +8,7 @@ import ./basics/destination
 
 export questionable
 export results
+export upraises
 export stint
 export uint48
 export ethaddress
diff --git a/nitro/basics/destination.nim b/nitro/basics/destination.nim
index f72f086..c7ad54e 100644
--- a/nitro/basics/destination.nim
+++ b/nitro/basics/destination.nim
@@ -1,10 +1,11 @@
 import std/hashes
 import pkg/questionable
 import pkg/questionable/results
+import pkg/upraises
 import pkg/stew/byteutils
 import ./ethaddress
 
-include questionable/errorban
+push: {.upraises:[].}
 
 type Destination* = distinct array[32, byte]
 
diff --git a/nitro/keys.nim b/nitro/keys.nim
index 5beed84..cdc6752 100644
--- a/nitro/keys.nim
+++ b/nitro/keys.nim
@@ -5,7 +5,7 @@ import ./basics
 export basics
 export toPublicKey
 
-include questionable/errorban
+push: {.upraises:[].}
 
 type
   PrivateKey* = SkSecretKey
diff --git a/nitro/protocol/abi.nim b/nitro/protocol/abi.nim
index b09681e..005866f 100644
--- a/nitro/protocol/abi.nim
+++ b/nitro/protocol/abi.nim
@@ -1,7 +1,7 @@
 import pkg/stew/endians2
 import ../basics
 
-include questionable/errorban
+push: {.upraises:[].}
 
 export basics
 
diff --git a/nitro/protocol/channel.nim b/nitro/protocol/channel.nim
index 72756eb..ca95cb8 100644
--- a/nitro/protocol/channel.nim
+++ b/nitro/protocol/channel.nim
@@ -2,7 +2,7 @@ import pkg/nimcrypto
 import ../basics
 import ./abi
 
-include questionable/errorban
+push: {.upraises:[].}
 
 export basics
 
diff --git a/nitro/protocol/outcome.nim b/nitro/protocol/outcome.nim
index ca30a6d..069e61a 100644
--- a/nitro/protocol/outcome.nim
+++ b/nitro/protocol/outcome.nim
@@ -2,7 +2,7 @@ import pkg/nimcrypto
 import ../basics
 import ./abi
 
-include questionable/errorban
+push: {.upraises:[].}
 
 export basics
 
diff --git a/nitro/protocol/signature.nim b/nitro/protocol/signature.nim
index 5a33dbb..ed21304 100644
--- a/nitro/protocol/signature.nim
+++ b/nitro/protocol/signature.nim
@@ -5,10 +5,11 @@ import ../basics
 import ../keys
 import ./state
 
-include questionable/errorban
+push: {.upraises:[].}
 
 export basics
 export keys
+export secp256k1
 
 type Signature* = SkRecoverableSignature
 
diff --git a/nitro/protocol/state.nim b/nitro/protocol/state.nim
index 1a5933c..bf431af 100644
--- a/nitro/protocol/state.nim
+++ b/nitro/protocol/state.nim
@@ -4,7 +4,7 @@ import ./channel
 import ./outcome
 import ./abi
 
-include questionable/errorban
+push: {.upraises:[].}
 
 export basics
 export channel
diff --git a/nitro/wallet/balances.nim b/nitro/wallet/balances.nim
index 01b6f01..1bfdcfb 100644
--- a/nitro/wallet/balances.nim
+++ b/nitro/wallet/balances.nim
@@ -3,7 +3,7 @@ import std/sequtils
 import ../basics
 import ../protocol
 
-include questionable/errorban
+push: {.upraises:[].}
 
 export tables
 
diff --git a/nitro/wallet/signedstate.nim b/nitro/wallet/signedstate.nim
index 3b1d9f4..7322c93 100644
--- a/nitro/wallet/signedstate.nim
+++ b/nitro/wallet/signedstate.nim
@@ -1,7 +1,7 @@
 import ../basics
 import ../protocol
 
-include questionable/errorban
+push: {.upraises:[].}
 
 type
   SignedState* = object
diff --git a/nitro/wallet/wallet.nim b/nitro/wallet/wallet.nim
index 2a9c6c7..9830b6b 100644
--- a/nitro/wallet/wallet.nim
+++ b/nitro/wallet/wallet.nim
@@ -6,7 +6,7 @@ import ./signedstate
 import ./ledger
 import ./balances
 
-include questionable/errorban
+push: {.upraises:[].}
 
 export basics
 export keys