I'm fixing location logic for null.
Merge branch 'rfrost'