Catching some more exceptions and bugs.