Fix some null issues in macros.