Added 2 more exceptions & Removed 1  not thrown Exception(#215)