Migrate things to _error version where sensible