Merge "Adds null pointer checking"