Javadoc and unneeded exceptions fix