[#1436] fixes for better timing on the null player.