couple of minor nullp prevention fixes, let people go back a step on a tour