Correctly support top level errors for auth with commands as well as legacy