Made location change mandatory for invalid locations