More empty/invalid tag crash fixes.

Change-Id: Ifdc7caa944a54fbf3efeb96126b1eca5340d3ce9
1 file changed