diff --git a/mods/ENTITIES/mcl_minecarts/movement.lua b/mods/ENTITIES/mcl_minecarts/movement.lua
index e0fb8f22f..5a8f023ed 100644
--- a/mods/ENTITIES/mcl_minecarts/movement.lua
+++ b/mods/ENTITIES/mcl_minecarts/movement.lua
@@ -307,7 +307,7 @@ local function do_movement_step(staticdata, dtime)
 	local remaining_in_block = 1 - x_0
 
 	-- Calculate acceleration
-	local v_0 = staticdata.velocity
+	local v_0 = staticdata.velocity or 0
 	local a = 0
 	if staticdata.ahead or staticdata.behind then
 		-- Calculate acceleration of the entire train
diff --git a/textures/default_rail_t_junction_on.png b/textures/default_rail_t_junction_on.png
index b605180e1..cfaece833 100644
Binary files a/textures/default_rail_t_junction_on.png and b/textures/default_rail_t_junction_on.png differ