ESSENTIALS-398: move existing fields check to correct location.