Added more exceptions.