Another little improvement on exception handling, #111