diff --git a/src/Mod/Path/PathScripts/PathPost.py b/src/Mod/Path/PathScripts/PathPost.py
index f1d30f5afa..a75525259b 100644
--- a/src/Mod/Path/PathScripts/PathPost.py
+++ b/src/Mod/Path/PathScripts/PathPost.py
@@ -250,8 +250,9 @@ class CommandPathPost:
             PathLog.debug("obj: {}".format(obj.Name))
             if not isinstance(obj.Proxy, PathToolController.ToolController):
                 tc = PathUtil.toolControllerForOp(obj)
-                if tc.ToolNumber != currTool:
-                    postlist.append(tc)
+                if tc is not None:
+                    if tc.ToolNumber != currTool:
+                        postlist.append(tc)
                 postlist.append(obj)
 
         fail = True
diff --git a/src/Mod/Path/PathScripts/post/linuxcnc_post.py b/src/Mod/Path/PathScripts/post/linuxcnc_post.py
index 14ab4b3965..eb5c882417 100644
--- a/src/Mod/Path/PathScripts/post/linuxcnc_post.py
+++ b/src/Mod/Path/PathScripts/post/linuxcnc_post.py
@@ -225,7 +225,7 @@ def parse(pathobj):
     # params = ['X','Y','Z','A','B','I','J','K','F','S'] #This list control
     # the order of parameters
     # linuxcnc doesn't want K properties on XY plane  Arcs need work.
-    params = ['X', 'Y', 'Z', 'A', 'B', 'I', 'J', 'F', 'S', 'T', 'Q', 'R', 'L']
+    params = ['X', 'Y', 'Z', 'A', 'B', 'I', 'J', 'F', 'S', 'T', 'Q', 'R', 'L', 'H']
 
     if hasattr(pathobj, "Group"):  # We have a compound or project.
         # if OUTPUT_COMMENTS: