diff --git a/Cargo.lock b/Cargo.lock
index daeae6c9..68c6b69d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3993,7 +3993,7 @@ dependencies = [
 
 [[package]]
 name = "grin_api"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "async-stream",
  "bytes 1.11.1",
@@ -4026,7 +4026,7 @@ dependencies = [
 
 [[package]]
 name = "grin_chain"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "bit-vec 0.6.3",
  "bitflags 1.3.2",
@@ -4048,7 +4048,7 @@ dependencies = [
 
 [[package]]
 name = "grin_config"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
@@ -4063,7 +4063,7 @@ dependencies = [
 
 [[package]]
 name = "grin_core"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -4088,7 +4088,7 @@ dependencies = [
 
 [[package]]
 name = "grin_keychain"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -4109,7 +4109,7 @@ dependencies = [
 
 [[package]]
 name = "grin_p2p"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "bitflags 1.3.2",
  "built",
@@ -4131,7 +4131,7 @@ dependencies = [
 
 [[package]]
 name = "grin_pool"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "blake2-rfc",
  "chrono",
@@ -4162,7 +4162,7 @@ dependencies = [
 
 [[package]]
 name = "grin_servers"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "async-stream",
  "chrono",
@@ -4192,7 +4192,7 @@ dependencies = [
 
 [[package]]
 name = "grin_store"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "byteorder",
  "croaring",
@@ -4210,7 +4210,7 @@ dependencies = [
 
 [[package]]
 name = "grin_util"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "anyhow",
  "backtrace",
diff --git a/node b/node
index 386ac1ed..bce5a714 160000
--- a/node
+++ b/node
@@ -1 +1 @@
-Subproject commit 386ac1ed5c37d44853c63e294242b16ebc12e963
+Subproject commit bce5a7144be4085dc9f4bcbb66d860ffeef9b4ca
diff --git a/src/wallet/wallet.rs b/src/wallet/wallet.rs
index a4b9b6cf..5ee4dd30 100644
--- a/src/wallet/wallet.rs
+++ b/src/wallet/wallet.rs
@@ -667,6 +667,8 @@ impl Wallet {
 		// Retrieve txs from database.
 		let txs: Vec<TxLogEntry> = w
 			.tx_log_iter()?
+			.filter(|tx| tx.is_ok())
+			.map(|tx| tx.unwrap())
 			.filter(|tx_entry| tx_entry.parent_key_id == parent_key_id)
 			// Filter transactions to not show txs without slate (usually unspent outputs).
 			.filter(|tx| {
@@ -709,6 +711,8 @@ impl Wallet {
 			let parent_key_id = w.parent_key_id();
 			// Retrieve txs from database.
 			w.tx_log_iter()?
+				.filter(|tx| tx.is_ok())
+				.map(|tx| tx.unwrap())
 				.filter(|tx_entry| tx_entry.parent_key_id == parent_key_id)
 				.filter(|tx_entry| {
 					if tx_entry.tx_type == TxLogEntryType::TxSent
@@ -1491,6 +1495,8 @@ impl Wallet {
 					// Find wallet transaction to update or create.
 					let txs = w
 						.tx_log_iter()?
+						.filter(|tx| tx.is_ok())
+						.map(|tx| tx.unwrap())
 						.filter(|entry| {
 							if let Some(excess) = entry.kernel_excess {
 								return excess == proof.excess;
diff --git a/wallet b/wallet
index 8847ee51..c2db7545 160000
--- a/wallet
+++ b/wallet
@@ -1 +1 @@
-Subproject commit 8847ee51578301ea7e525eecfb2df50cd75d7cbb
+Subproject commit c2db754552b9e5c57c4a843c68744df0cc744ff8