diff --git a/core/src/ledger_cleanup_service.rs b/core/src/ledger_cleanup_service.rs
index 1b90abea2..ba944169c 100644
--- a/core/src/ledger_cleanup_service.rs
+++ b/core/src/ledger_cleanup_service.rs
@@ -66,16 +66,20 @@ impl LedgerCleanupService {
 
         let disk_utilization_post = blocktree.storage_size();
 
-        datapoint_debug!(
-            "ledger_disk_utilization",
-            ("disk_utilization_pre", disk_utilization_pre as i64, i64),
-            ("disk_utilization_post", disk_utilization_post as i64, i64),
-            (
-                "disk_utilization_delta",
-                (disk_utilization_pre as i64 - disk_utilization_post as i64),
-                i64
-            )
-        );
+        if let (Some(disk_utilization_pre), Some(disk_utilization_post)) =
+            (disk_utilization_pre, disk_utilization_post)
+        {
+            datapoint_debug!(
+                "ledger_disk_utilization",
+                ("disk_utilization_pre", disk_utilization_pre as i64, i64),
+                ("disk_utilization_post", disk_utilization_post as i64, i64),
+                (
+                    "disk_utilization_delta",
+                    (disk_utilization_pre as i64 - disk_utilization_post as i64),
+                    i64
+                )
+            );
+        }
 
         Ok(())
     }
diff --git a/ledger/src/blocktree.rs b/ledger/src/blocktree.rs
index 98e261a3d..676ee8e96 100644
--- a/ledger/src/blocktree.rs
+++ b/ledger/src/blocktree.rs
@@ -1493,7 +1493,7 @@ impl Blocktree {
         self.last_root()
     }
 
-    pub fn storage_size(&self) -> u64 {
+    pub fn storage_size(&self) -> Option<u64> {
         self.db.storage_size()
     }
 }
diff --git a/ledger/src/blocktree_db.rs b/ledger/src/blocktree_db.rs
index 716a570c3..7df26a1dd 100644
--- a/ledger/src/blocktree_db.rs
+++ b/ledger/src/blocktree_db.rs
@@ -580,8 +580,8 @@ impl Database {
         self.backend.write(batch.write_batch)
     }
 
-    pub fn storage_size(&self) -> u64 {
-        get_size(&self.path).expect("failure while reading ledger directory size")
+    pub fn storage_size(&self) -> Option<u64> {
+        get_size(&self.path).ok()
     }
 }