Refactoring condition asserts for #126