TRUNK-3956

caught the DataIntegrityViolationException error plus any other errors