Changes to error macro