[IMP-dev] Proposed change to checks and asserts