Added more exceptions