doc updates, npe check