Add check so events will not break if location is missing