DEVSUPPORT-1288: fix issue with saving entities raising exception