do null check for invalid site, instead of false

if an invalid site, then null is returned and check for it here.

Change-Id: I1b32a7f5ee7c6b2fb3128104ce1fb85f361bad81
Merge "do null check for invalid site, instead of false"