Added Divison By Zero management