Merge "added check for null object"