added nil? checks to location validators