Added sanity check macro
5 files changed