Merge "Fixed _error_checker in rest client"