Added check for location already existing