diff --git a/execution/src/evm.rs b/execution/src/evm.rs
index 77ecb3d..bad11b4 100644
--- a/execution/src/evm.rs
+++ b/execution/src/evm.rs
@@ -128,8 +128,9 @@ impl<R: Rpc> Evm<R> {
         let mut account_map = HashMap::new();
         accounts.iter().for_each(|account| {
             let addr = account.0;
-            let account = account.1.as_ref().unwrap().clone();
-            account_map.insert(addr, account);
+            if let Ok(account) = &account.1 {
+                account_map.insert(addr, account.clone());
+            }
         });
 
         Ok(account_map)
diff --git a/execution/src/rpc/http_rpc.rs b/execution/src/rpc/http_rpc.rs
index a64c647..a825a5b 100644
--- a/execution/src/rpc/http_rpc.rs
+++ b/execution/src/rpc/http_rpc.rs
@@ -32,8 +32,8 @@ impl Clone for HttpRpc {
 impl Rpc for HttpRpc {
     fn new(rpc: &str) -> Result<Self> {
         let http = Http::from_str(rpc)?;
-        let mut client = RetryClient::new(http, Box::new(HttpRateLimitRetryPolicy), 100, 10);
-        client.set_compute_units(250);
+        let mut client = RetryClient::new(http, Box::new(HttpRateLimitRetryPolicy), 100, 250);
+        client.set_compute_units(100);
         let provider = Provider::new(client);
         Ok(HttpRpc {
             url: rpc.to_string(),