ENC-3653: Add some assertions