more exceptions removed