Fixing infinite replication issue if concurrency exception is thrown