Propagate errors up, normalize options names