Card #242 identifier EntityExistsException check on update, cleaner controller