CAY-1946 CDbimport improvements

fixing NPE when no entities are matched