Merge "Adding null check to prevent monkey crash. (5263199)"