revert changes to fix eclipse warning of potential NPE, but add a suppresswarning annotation (with a comment) on them, for future reference