Expose another NPE source

Change-Id: I8a4eacd72d3da1a5de2424c50a54d8817511b2a0
Deal with null charges on 'this' too

Change-Id: I94f5cea8fef424c597bd00390f056d87782a2247