CDB-4165 Working feature retrieval, hardened error scenarios