Some more fixes to avoid spurious NPEs.  Refs #2842

Change-Id: Ifc263b7e92f141ffd938a61e447d23eb35ff5520