[17.12] Add back null check to allow merge editor to load#11255