diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index 651fab434..4013dd5a5 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -30,6 +30,7 @@ use util::sha3::*;
 use util::rlp::{encode, decode, UntrustedRlp, View};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::{MiningBlockChainClient, BlockID, TransactionID, UncleID};
+use ethcore::header::Header as BlockHeader;
 use ethcore::block::IsBlock;
 use ethcore::views::*;
 use ethcore::ethereum::Ethash;
@@ -126,33 +127,38 @@ impl<C, S, M, EM> EthClient<C, S, M, EM> where
 
 	fn uncle(&self, id: UncleID) -> Result<Value, Error> {
 		let client = take_weak!(self.client);
-		match client.uncle(id).and_then(|u| client.block_total_difficulty(BlockID::Hash(u.parent_hash().clone())).map(|diff| (diff, u))) {
-			Some((parent_difficulty, uncle)) => {
-				let block = Block {
-					hash: OptionalValue::Value(uncle.hash()),
-					parent_hash: uncle.parent_hash,
-					uncles_hash: uncle.uncles_hash,
-					author: uncle.author,
-					miner: uncle.author,
-					state_root: uncle.state_root,
-					transactions_root: uncle.transactions_root,
-					number: OptionalValue::Value(U256::from(uncle.number)),
-					gas_used: uncle.gas_used,
-					gas_limit: uncle.gas_limit,
-					logs_bloom: uncle.log_bloom,
-					timestamp: U256::from(uncle.timestamp),
-					difficulty: uncle.difficulty,
-					total_difficulty: uncle.difficulty + parent_difficulty,
-					receipts_root: uncle.receipts_root,
-					extra_data: Bytes::new(uncle.extra_data),
-					seal_fields: uncle.seal.into_iter().map(|f| decode(&f)).map(Bytes::new).collect(),
-					uncles: vec![],
-					transactions: BlockTransactions::Hashes(vec![]),
-				};
-				to_value(&block)
-			},
-			None => Ok(Value::Null)
-		}
+
+		let uncle: BlockHeader = match client.uncle(id) {
+			Some(rlp) => decode(&rlp),
+			None => { return Ok(Value::Null); }
+		};
+		let parent_difficulty = match client.block_total_difficulty(BlockID::Hash(uncle.parent_hash().clone())) {
+			Some(difficulty) => difficulty,
+			None => { return Ok(Value::Null); }
+		};
+
+		let block = Block {
+			hash: OptionalValue::Value(uncle.hash()),
+			parent_hash: uncle.parent_hash,
+			uncles_hash: uncle.uncles_hash,
+			author: uncle.author,
+			miner: uncle.author,
+			state_root: uncle.state_root,
+			transactions_root: uncle.transactions_root,
+			number: OptionalValue::Value(U256::from(uncle.number)),
+			gas_used: uncle.gas_used,
+			gas_limit: uncle.gas_limit,
+			logs_bloom: uncle.log_bloom,
+			timestamp: U256::from(uncle.timestamp),
+			difficulty: uncle.difficulty,
+			total_difficulty: uncle.difficulty + parent_difficulty,
+			receipts_root: uncle.receipts_root,
+			extra_data: Bytes::new(uncle.extra_data),
+			seal_fields: uncle.seal.into_iter().map(|f| decode(&f)).map(Bytes::new).collect(),
+			uncles: vec![],
+			transactions: BlockTransactions::Hashes(vec![]),
+		};
+		to_value(&block)
 	}
 
 	fn sign_call(&self, request: CallRequest) -> Result<SignedTransaction, Error> {