Add null check, fix annotations and warnings in node provider

Bug: 29328618
Change-Id: I3ae1857508ccc7763cb93cbc85bd2c9282956a67
1 file changed