fixed NPE

Change-Id: I7920db14dd6696bd3ade3be7fb48773417b2fa8f