Fix a NPE in TombstoneManager