Add asserts

Change-Id: I8259ffb74cb00dade007415f9e0b90f88db6145c