Do null check inline rather than using a local variable

Test: Support4Demos
Change-Id: I05009f921ff7508426f1182d0fc8d72dcb9522ee
1 file changed