Added some state checks in the macros. -Micah