- added several JavaDocs and an additional exception