OPS-26: ERR500 fix