added more exceptions