diff --git a/ethcore/light/src/transaction_queue.rs b/ethcore/light/src/transaction_queue.rs
index 50d6a918e..8ca6a64f6 100644
--- a/ethcore/light/src/transaction_queue.rs
+++ b/ethcore/light/src/transaction_queue.rs
@@ -234,8 +234,14 @@ impl TransactionQueue {
 					Some(Condition::Timestamp(time)) => time <= best_block_timestamp,
 				}).map(|info| info.hash)
 			})
-			.filter_map(|hash| self.by_hash.get(&hash))
-			.cloned()
+			.filter_map(|hash| match self.by_hash.get(&hash) {
+				Some(tx) => Some(tx.clone()),
+				None => {
+					warn!(target: "txqueue", "Inconsistency detected between `by_hash` and `by_account`: {} not stored.",
+						hash);
+					None
+				}
+			})
 			.collect()
 	}