diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua
index 70eceb8..eadfd93 100644
--- a/advtrains_interlocking/route_prog.lua
+++ b/advtrains_interlocking/route_prog.lua
@@ -491,6 +491,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			advtrains.interlocking.clear_visu_context("prog_"..pname)
 			player_rte_prog[pname] = nil
 			chat(pname, "Successfully programmed route.")
+			
+			advtrains.interlocking.show_route_edit_form(pname, rp.origin, #tcbs.routes)
 			return
 		end
 	end 
diff --git a/advtrains_line_automation/stoprail.lua b/advtrains_line_automation/stoprail.lua
index 7ddcec6..cc2c8ac 100644
--- a/advtrains_line_automation/stoprail.lua
+++ b/advtrains_line_automation/stoprail.lua
@@ -83,7 +83,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				return
 			end
 			local stn = advtrains.lines.stations[stdata.stn]
-			if fields.stnname and fields.stnname ~= stn.name then
+			if stn and fields.stnname and fields.stnname ~= stn.name then
 				if (stn.owner == pname or minetest.check_player_privs(pname, "train_admin")) then
 					stn.name = fields.stnname
 				else