missed a few more exceptions