Part 2 of tweaking. Raised some more exceptions.