Added a few more exceptions