Add missing Override and Nullable annotations. Update Javadoc to mention correct return value. Closes #2506