Better checks on location