Fix again the NPE

Change-Id: I9a26ba9243105bdb4938dd491038a7a4990a49aa