Add some additionall error handling macros.