Replace remaining error() calls with critical()