Catch some more exceptions and make errors sane