possible NPE

Change-Id: I0d4355a2fb590784c9417c71ee09d28f843e7d4a