Get rid of two more exceptions