CLI: Remove duplicated error reporting code paths