diff --git a/lib/ain-evm/src/block.rs b/lib/ain-evm/src/block.rs
index 144b8cc186..0a2e804a8f 100644
--- a/lib/ain-evm/src/block.rs
+++ b/lib/ain-evm/src/block.rs
@@ -265,7 +265,8 @@ impl BlockService {
         let block = self
             .storage
             .get_latest_block()?
-            .expect("Unable to find latest block");
+            .ok_or(format_err!("Unable to find latest block"))?;
+
         blocks.push(block.clone());
         let mut parent_hash = block.header.parent_hash;