Fix NPE in fix (#12504)

Change-Id: I65960bcfae850955ea40584445125c0affa26848