Fixed some javadoc comments and removed an unnecessary exception handler.