Fixed some more exceptions not raised.