Added some missing NSAsserts