- minor javadoc fix
- added wrapping of unexpected exceptions
- fixed a bug where when could possibly swallow an exception