* added some javadoc
* decreased exception trace length