Tweaks to error macros
More tweaks to error macros