Added missing JavaDocs, tweaked exception handling