use strict null check

Change-Id: I23d1b6b90ed46bf4b2b737539435c66b97a9a51d