check for nullpointer

Change-Id: I15b86be07d85e709fd3b79395a59c5882b46a4e8