Fix Javadoc, Add @Override, Stricter exception handling.