diff --git a/core/blockchain.go b/core/blockchain.go
index 1a80d8cd3cdcd..c602cefd6c881 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -800,12 +800,7 @@ func (bc *BlockChain) Stop() {
 
 		for _, offset := range []uint64{0, 1, TriesInMemory - 1} {
 			if number := bc.CurrentBlock().NumberU64(); number > offset {
-				num := number - offset
-				recent := bc.GetBlockByNumber(num)
-				if recent == nil {
-					log.Error("Failed to get block", num)
-					continue
-				}
+				recent := bc.GetBlockByNumber(number - offset)
 				log.Info("Writing cached state to disk", "block", recent.Number(), "hash", recent.Hash(), "root", recent.Root())
 				if err := triedb.Commit(recent.Root(), true, nil); err != nil {
 					log.Error("Failed to commit recent state trie", "err", err)