Added a couple of assertions