Merge "Added null check"