Javadoc + NullPointerException corrected