Merge "Fix for potential null access."