#11 adding exceptions