Fix how we display errors with a macro