Fixing failure message from client CAF-268