Exception traps macros corrections