Improvements to more exceptions. Relates to #1.