fix macro creation error messages
merge