Some null checks#20

zaclimon wants to merge 3 commits intogooglesamples:mastergooglesamples/androidtv-sample-inputs:masterfrom

zaclimon:masterCopy head branch name to clipboard