Fix an issue that cause null value be replaced by "null" string
Revise javadoc