Merge "Added null check for monkey behavior"