ah!, the original code had a type in it. That's
why it was refactored to remove the null check.

Now a proper fix for cids: 1326180<->1326190

Change-Id: Iba7fd47c03eb5c157f878e0e297e8688f20ae348