Javadoc update.
Added an additional null check.