Try to fix NPE

Change-Id: I5b605b4b77e8e25b1a2e475d0e16a24c47225f10