Merge "Adding a null checker"