diff --git a/klippy/toolhead.py b/klippy/toolhead.py
index c8a48fa8..4999a1ec 100644
--- a/klippy/toolhead.py
+++ b/klippy/toolhead.py
@@ -243,6 +243,10 @@ class ToolHead:
         try:
             mod = importlib.import_module('kinematics.' + kin_name)
             self.kin = mod.load_kinematics(self, config)
+        except config.error as e:
+            raise
+        except self.printer.lookup_object('pins').error as e:
+            raise
         except:
             msg = "Error loading kinematics '%s'" % (kin_name,)
             logging.exception(msg)