TRUNK-3956 ~ caught the DataIntegrityViolationException error
(cherry picked from commit 996ddca7c8c64ac87f7c2a54addf81f923b82966)