diff --git a/app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/bitcoind/WalletResult.scala b/app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/bitcoind/WalletResult.scala
index 1a456da3de..c0f0b15539 100644
--- a/app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/bitcoind/WalletResult.scala
+++ b/app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/bitcoind/WalletResult.scala
@@ -1,6 +1,7 @@
 package org.bitcoins.commons.jsonmodels.bitcoind
 
 import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.LabelPurpose
+import org.bitcoins.commons.rpc.BitcoindException
 import org.bitcoins.core.currency.{Bitcoins, Satoshis}
 import org.bitcoins.core.hd.BIP32Path
 import org.bitcoins.core.number.UInt32
@@ -389,7 +390,8 @@ final case class CreateWalletResult(
 
 case class ImportDescriptorResult(
     success: Boolean,
-    warnings: Option[Vector[String]]
+    warnings: Option[Vector[String]],
+    error: Option[BitcoindException]
 ) extends WalletResult
 
 case class PrioritisedTransaction(fee_delta: Satoshis, in_mempool: Boolean)
diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/BitcoindException.scala b/app-commons/src/main/scala/org/bitcoins/commons/rpc/BitcoindException.scala
similarity index 97%
rename from bitcoind-rpc/src/main/scala/org/bitcoins/rpc/BitcoindException.scala
rename to app-commons/src/main/scala/org/bitcoins/commons/rpc/BitcoindException.scala
index 2ab03ce565..9fca717c1b 100644
--- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/BitcoindException.scala
+++ b/app-commons/src/main/scala/org/bitcoins/commons/rpc/BitcoindException.scala
@@ -1,9 +1,6 @@
-package org.bitcoins.rpc
+package org.bitcoins.commons.rpc
 
-import play.api.libs.json.Reads
-import play.api.libs.json.{JsResult, JsValue}
-import play.api.libs.json.JsError
-import play.api.libs.json.JsSuccess
+import play.api.libs.json.*
 
 /** Represents failures that can happen when using the `bitcoind` RPC interface.
   *
@@ -25,9 +22,8 @@ sealed abstract class BitcoindException(private val message: String)
   */
 
 object BitcoindException {
-  import org.bitcoins.rpc.BitcoindP2PException._
-  import org.bitcoins.rpc.BitcoindWalletException._
-
+  import BitcoindP2PException.*
+  import BitcoindWalletException.*
   implicit val reads: Reads[BitcoindException] = new Reads[BitcoindException] {
 
     def reads(json: JsValue): JsResult[BitcoindException] =
diff --git a/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala b/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala
index a0033a824f..3b64717d3f 100644
--- a/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala
+++ b/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala
@@ -34,7 +34,7 @@ import org.bitcoins.node.Node
 import org.bitcoins.node.config.NodeAppConfig
 import org.bitcoins.node.models.NodeStateDescriptorDAO
 import org.bitcoins.rpc.BitcoindCallbacks
-import org.bitcoins.rpc.BitcoindException.InWarmUp
+import org.bitcoins.commons.rpc.BitcoindException.InWarmUp
 import org.bitcoins.rpc.client.common.BitcoindRpcClient
 import org.bitcoins.rpc.config.{BitcoindRpcAppConfig, ZmqConfig}
 import org.bitcoins.server.bitcoind.BitcoindSyncState
diff --git a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MempoolRpcTest.scala b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MempoolRpcTest.scala
index e5694b5a18..dcf45dd66e 100644
--- a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MempoolRpcTest.scala
+++ b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MempoolRpcTest.scala
@@ -1,5 +1,6 @@
 package org.bitcoins.rpc.common
 
+import org.bitcoins.commons.rpc.BitcoindException
 import org.bitcoins.core.currency.{Bitcoins, Satoshis}
 import org.bitcoins.core.number.UInt32
 import org.bitcoins.core.protocol.BitcoinAddress
@@ -9,7 +10,6 @@ import org.bitcoins.core.protocol.transaction.{
   TransactionOutPoint
 }
 import org.bitcoins.crypto.DoubleSha256Digest
-import org.bitcoins.rpc.BitcoindException
 import org.bitcoins.rpc.config.{BitcoindInstanceLocal, BitcoindInstanceRemote}
 import org.bitcoins.testkit.rpc.{
   BitcoindFixturesCachedPairNewest,
diff --git a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MultiWalletRpcTest.scala b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MultiWalletRpcTest.scala
index fa6454b81f..a74f97db7a 100644
--- a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MultiWalletRpcTest.scala
+++ b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MultiWalletRpcTest.scala
@@ -1,10 +1,10 @@
 package org.bitcoins.rpc.common
 
 import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.AddressType
+import org.bitcoins.commons.rpc.BitcoindWalletException
 import org.bitcoins.core.currency.{Bitcoins, Satoshis}
 import org.bitcoins.core.protocol.transaction._
 import org.bitcoins.core.wallet.fee.SatoshisPerByte
-import org.bitcoins.rpc._
 import org.bitcoins.rpc.client.common._
 import org.bitcoins.rpc.config.{BitcoindInstanceLocal, BitcoindInstanceRemote}
 import org.bitcoins.rpc.util.{NodePair, RpcUtil}
diff --git a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/NodeRpcTest.scala b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/NodeRpcTest.scala
index aa5e75bd3d..55d0d9a176 100644
--- a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/NodeRpcTest.scala
+++ b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/NodeRpcTest.scala
@@ -1,7 +1,7 @@
 package org.bitcoins.rpc.common
 
 import org.bitcoins.core.number.UInt32
-import org.bitcoins.rpc.BitcoindException.MiscError
+import org.bitcoins.commons.rpc.BitcoindException.MiscError
 import org.bitcoins.testkit.rpc.BitcoindFixturesFundedCachedNewest
 
 import scala.concurrent.duration._
diff --git a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/RawTransactionRpcTest.scala b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/RawTransactionRpcTest.scala
index add79edb17..77be0c0ed7 100644
--- a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/RawTransactionRpcTest.scala
+++ b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/RawTransactionRpcTest.scala
@@ -10,7 +10,7 @@ import org.bitcoins.core.protocol.script.{
 }
 import org.bitcoins.core.protocol.transaction._
 import org.bitcoins.core.wallet.fee.SatoshisPerByte
-import org.bitcoins.rpc.BitcoindException.InvalidAddressOrKey
+import org.bitcoins.commons.rpc.BitcoindException.InvalidAddressOrKey
 import org.bitcoins.testkit.rpc.{
   BitcoindFixturesCachedPairNewest,
   BitcoindRpcTestUtil
diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala
index b984f4c769..34996c5296 100644
--- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala
+++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala
@@ -32,9 +32,9 @@ import scala.concurrent.Future
   * versions. If you need RPC calls specific to a version, check out
   *
   * If a RPC call fails for any reason, a
-  * [[org.bitcoins.rpc.BitcoindException BitcoindException]] is thrown. This is
-  * a sealed abstract class, so you can pattern match easily on the errors, and
-  * handle them as you see fit.
+  * [[BitcoindException BitcoindException]] is thrown. This is a sealed abstract
+  * class, so you can pattern match easily on the errors, and handle them as you
+  * see fit.
   */
 class BitcoindRpcClient(override val instance: BitcoindInstance)(implicit
     override val system: ActorSystem,
diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala
index b2ceef52fe..f574643d51 100644
--- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala
+++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala
@@ -22,7 +22,7 @@ import org.bitcoins.core.config._
 import org.bitcoins.core.crypto.ECPrivateKeyUtil
 import org.bitcoins.core.util.StartStopAsync
 import org.bitcoins.crypto.{ECPrivateKey, ECPrivateKeyBytes}
-import org.bitcoins.rpc.BitcoindException
+import org.bitcoins.commons.rpc.BitcoindException
 import org.bitcoins.rpc.config.BitcoindAuthCredentials.{
   CookieBased,
   PasswordBased
diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/MempoolRpc.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/MempoolRpc.scala
index 741c70f7c4..c67afa6e42 100644
--- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/MempoolRpc.scala
+++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/MempoolRpc.scala
@@ -1,11 +1,11 @@
 package org.bitcoins.rpc.client.common
 
 import org.bitcoins.commons.jsonmodels.bitcoind._
+import org.bitcoins.commons.rpc.BitcoindException
 import org.bitcoins.commons.serializers.JsonReaders._
 import org.bitcoins.commons.serializers.JsonSerializers._
 import org.bitcoins.core.protocol.transaction.{Transaction, TransactionOutPoint}
 import org.bitcoins.crypto.{DoubleSha256Digest, DoubleSha256DigestBE}
-import org.bitcoins.rpc.BitcoindException
 import play.api.libs.json.{JsArray, JsBoolean, JsString, Json}
 
 import java.nio.file.Path
diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindRpcAppConfig.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindRpcAppConfig.scala
index 0203aaa1dc..d4aff31a3b 100644
--- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindRpcAppConfig.scala
+++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindRpcAppConfig.scala
@@ -8,7 +8,7 @@ import org.bitcoins.core.api.CallbackConfig
 import org.bitcoins.core.api.callback.CallbackFactory
 import org.bitcoins.core.api.tor.Socks5ProxyParams
 import org.bitcoins.rpc.BitcoindCallbacks
-import org.bitcoins.rpc.BitcoindException.InWarmUp
+import org.bitcoins.commons.rpc.BitcoindException.InWarmUp
 import org.bitcoins.rpc.client.common.{BitcoindRpcClient, BitcoindVersion}
 import org.bitcoins.rpc.util.AppConfigFactoryActorSystem
 import org.bitcoins.tor.config.TorAppConfig
diff --git a/dlc-wallet-test/src/test/scala/org/bitcoins/dlc/integration/DLCClientIntegrationTest.scala b/dlc-wallet-test/src/test/scala/org/bitcoins/dlc/integration/DLCClientIntegrationTest.scala
index 4f9e455c78..3ee3cd3bdf 100644
--- a/dlc-wallet-test/src/test/scala/org/bitcoins/dlc/integration/DLCClientIntegrationTest.scala
+++ b/dlc-wallet-test/src/test/scala/org/bitcoins/dlc/integration/DLCClientIntegrationTest.scala
@@ -1,5 +1,6 @@
 package org.bitcoins.dlc.integration
 
+import org.bitcoins.commons.rpc.BitcoindException
 import org.bitcoins.core.currency.{Bitcoins, CurrencyUnit, Satoshis}
 import org.bitcoins.core.number.{UInt16, UInt32}
 import org.bitcoins.core.protocol.BlockStamp.BlockHeight
@@ -20,8 +21,7 @@ import org.bitcoins.core.protocol.transaction.{
 }
 import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
 import org.bitcoins.core.wallet.utxo._
-import org.bitcoins.crypto.{HashType, _}
-import org.bitcoins.rpc.BitcoindException
+import org.bitcoins.crypto.*
 import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
 import org.bitcoins.testkit.util.BitcoindRpcTest
 import org.bitcoins.testkitcore.dlc.{DLCFeeTestUtil, DLCTest, TestDLCClient}
diff --git a/docs/rpc/bitcoind.md b/docs/rpc/bitcoind.md
index e03a4cdf14..20d8ce88ad 100644
--- a/docs/rpc/bitcoind.md
+++ b/docs/rpc/bitcoind.md
@@ -36,7 +36,7 @@ import org.bitcoins.core.config._
 import org.bitcoins.rpc.config._
 import org.bitcoins.rpc.client.common._
 
-import org.bitcoins.rpc.BitcoindWalletException
+import org.bitcoins.commons.rpc.BitcoindWalletException
 import org.bitcoins.crypto._
 import org.bitcoins.core.protocol._
 import org.bitcoins.core.currency._
diff --git a/node-test/src/test/scala/org/bitcoins/node/BroadcastTransactionTest.scala b/node-test/src/test/scala/org/bitcoins/node/BroadcastTransactionTest.scala
index 258cb8642a..b17c962351 100644
--- a/node-test/src/test/scala/org/bitcoins/node/BroadcastTransactionTest.scala
+++ b/node-test/src/test/scala/org/bitcoins/node/BroadcastTransactionTest.scala
@@ -1,8 +1,8 @@
 package org.bitcoins.node
 
+import org.bitcoins.commons.rpc.BitcoindException
 import org.bitcoins.core.currency._
 import org.bitcoins.core.protocol.transaction.Transaction
-import org.bitcoins.rpc.BitcoindException
 import org.bitcoins.rpc.client.common.BitcoindRpcClient
 import org.bitcoins.server.BitcoinSAppConfig
 import org.bitcoins.testkit.BitcoinSTestAppConfig
diff --git a/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala
index 3f72e51ba3..179b08a0ad 100644
--- a/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala
+++ b/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala
@@ -9,6 +9,7 @@ import org.bitcoins.commons.jsonmodels.bitcoind.{
   RpcOpts,
   SignRawTransactionResult
 }
+import org.bitcoins.commons.rpc.BitcoindException
 import org.bitcoins.commons.util.BitcoinSLogger
 import org.bitcoins.core.config.RegTest
 import org.bitcoins.core.currency.Bitcoins
@@ -26,8 +27,7 @@ import org.bitcoins.crypto.{
   DoubleSha256DigestBE,
   ECPublicKey
 }
-import org.bitcoins.rpc.BitcoindException
-import org.bitcoins.rpc.client.common.BitcoindVersion._
+import org.bitcoins.rpc.client.common.BitcoindVersion.*
 import org.bitcoins.rpc.client.common.{BitcoindRpcClient, BitcoindVersion}
 import org.bitcoins.rpc.client.v25.BitcoindV25RpcClient
 import org.bitcoins.rpc.client.v26.BitcoindV26RpcClient
diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/WalletIntegrationTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/WalletIntegrationTest.scala
index eeb9aedfd1..9a913732e2 100644
--- a/wallet-test/src/test/scala/org/bitcoins/wallet/WalletIntegrationTest.scala
+++ b/wallet-test/src/test/scala/org/bitcoins/wallet/WalletIntegrationTest.scala
@@ -9,7 +9,7 @@ import org.bitcoins.core.psbt.PSBT
 import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
 import org.bitcoins.core.wallet.utxo.TxoState
 import org.bitcoins.feeprovider.RandomFeeProvider
-import org.bitcoins.rpc.BitcoindException.InvalidAddressOrKey
+import org.bitcoins.commons.rpc.BitcoindException.InvalidAddressOrKey
 import org.bitcoins.testkit.wallet.{
   BitcoinSWalletTestCachedBitcoindNewest,
   WalletTestUtil,