Merge "Fixed rest of null pointer warnings."