rename: simplify error processing