Also catch exceptions thrown in case of having an inconsistent state to avoid a hard crash.
Hopefully fixes and thereby closes #507 (closed)