diff -r 72c15641c8b4 -r 76a96e3a2bbb mercurial/debugcommands.py
--- a/mercurial/debugcommands.py	Wed Jan 15 15:49:35 2020 +0100
+++ b/mercurial/debugcommands.py	Wed Jan 15 15:49:45 2020 +0100
@@ -2113,13 +2113,17 @@
     elif opts['dump_disk']:
         unfi = repo.unfiltered()
         cl = unfi.changelog
-        data = nodemap.persisted_data(cl)
-        ui.write(data)
+        nm_data = nodemap.persisted_data(cl)
+        if nm_data is not None:
+            docket, data = nm_data
+            ui.write(data)
     elif opts['check']:
         unfi = repo.unfiltered()
         cl = unfi.changelog
-        data = nodemap.persisted_data(cl)
-        return nodemap.check_data(ui, cl.index, data)
+        nm_data = nodemap.persisted_data(cl)
+        if nm_data is not None:
+            docket, data = nm_data
+            return nodemap.check_data(ui, cl.index, data)
 
 
 @command(