Better err msg + fix for BeforeSaveEntity add issue.