cmd/gpt: Address error cases during gpt rename more correctly