Another small bugfix to how Exceptions are handled.