Add new errors and Raw handler