Merge "Check for null pointer before use."