Exception handling corrected, and javadoc error corrected