ADDR-60: Fix so that a stack trace is not thrown if duplicate records are found