Fix NPE for real

Change-Id: I49c9a4a2bef19813545c38a4015a29cbab94f040