Fixed a common crash when entering new locations, I think