diff --git a/advtrains/path.lua b/advtrains/path.lua
index 4ead244..2a8f54c 100644
--- a/advtrains/path.lua
+++ b/advtrains/path.lua
@@ -117,7 +117,6 @@ function advtrains.path_invalidate(train)
 	train.path_req_b=0
 	
 	train.dirty = true
-	advtrains.dbg_last_pathclear = "LAST PATH_INVALIDATE: "..debug.traceback()
 end
 
 -- Prints a path using the passed print function
diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua
index c129409..e7d8465 100644
--- a/advtrains/trainlogic.lua
+++ b/advtrains/trainlogic.lua
@@ -472,11 +472,7 @@ function advtrains.train_step_c(id, train, dtime)
 	run_callbacks_update(id, train)
 	
 	-- Return if something(TM) damaged the path
-	if not train.path then
-		atwarn(id,"@train_step_c missing path")
-		atwarn(advtrains.dbg_last_pathclear)
-		return
-	end
+	if train.no_step or train.wait_for_path or not train.path then return end
 	
 	advtrains.path_clear_unused(train)
 	
@@ -608,11 +604,6 @@ advtrains.te_register_on_new_path(function(id, train)
 end)
 
 advtrains.te_register_on_update(function(id, train)
-	if not train.path then
-		atwarn(id,"@register_on_update missing path")
-		atwarn(advtrains.dbg_last_pathclear)
-		return
-	end
 	local new_index = atround(train.index)
 	local new_end_index = atround(train.end_index)
 	local old_index = train.tnc.old_index