Changed default (development) macro error handling to throw.