- Added some exception types
- Fixed javadoc