Bug fix for duplicate-protection on waiver claim entry