Cycle reduction: account for new error codes

Merge request reports