Remove CLI fallback, fix client error.