Adding missing checks to macro.