diff --git a/scripts/modules/bpy/utils/__init__.py b/scripts/modules/bpy/utils/__init__.py
index 94b7394971b..e0b2d9f5783 100644
--- a/scripts/modules/bpy/utils/__init__.py
+++ b/scripts/modules/bpy/utils/__init__.py
@@ -888,11 +888,7 @@ def register_tool(tool_cls, *, after=None, separator=False, group=False):
         tool_cls._bl_tool = tool_def
 
         keymap_data = tool_def.keymap
-        if keymap_data is not None:
-            if context_mode is None:
-                context_descr = "All"
-            else:
-                context_descr = context_mode.replace("_", " ").title()
+        if keymap_data is not None and callable(keymap_data[0]):
             from bpy import context
             wm = context.window_manager
             keyconfigs = wm.keyconfigs
@@ -900,7 +896,11 @@ def register_tool(tool_cls, *, after=None, separator=False, group=False):
             # Note that Blender's default tools use the default key-config for both.
             # We need to use the add-ons for 3rd party tools so reloading the key-map doesn't clear them.
             kc = keyconfigs.addon
-            if callable(keymap_data[0]):
+            if kc is not None:
+                if context_mode is None:
+                    context_descr = "All"
+                else:
+                    context_descr = context_mode.replace("_", " ").title()
                 cls._km_action_simple(kc_default, kc, context_descr, tool_def.label, keymap_data)
         return tool_def
 
@@ -1025,6 +1025,8 @@ def unregister_tool(tool_cls):
         wm = context.window_manager
         keyconfigs = wm.keyconfigs
         for kc in (keyconfigs.default, keyconfigs.addon):
+            if kc is None:
+                continue
             km = kc.keymaps.get(keymap_data[0])
             if km is None:
                 print("Warning keymap %r not found in %r!" % (keymap_data[0], kc.name))