Merge "Add null check, fix annotations and warnings in node provider" into nyc-dev