Add pre-assert, fix comment