Merge "Remove unused arguments from _error_checker()"