Better assertion handling