More safeguards to current location

Added some more safeguards to hopefully stop nulls from showing up
while creating locations. Also did some cleanup.