Kdalton/sample feedback

@anttikajanus - Please review updates/fixes based on feedback. 
Check if LocationDisplay is null before checking if it enabled.