Fixed so that a user can't change location to nothing