Added some more exceptions.