Merge "Check the parent for null in deleteEditor"