- NullException Prevention

Change-Id: I61fd4fa97be6339d9061be4dfa9e7de0e7c87f5a