Added assertions handling