TRUNK-3956 ~ caught the DataIntegrityViolationException error
Merge pull request #373 from k-joseph/TRUNK-3956

TRUNK-3956