Yeah I think the correct fix here is to not throw an error but just limit returned records. However the actual issue of duplication should not happen.