CFY-1795 fix recoverable error bugs