Make all error invocations consistent