Kill this NPE

Winga45 found it and I killed it

Change-Id: Iedbab3715d256d79f169060027490d43d8bd80c5