Add a couple of protective asserts