Work Item shows change set on links tab, albeit an error is displayed while saving the artifact through RTC web

We have automated the deployment of release using UCD. Developers deliver their build artifact, a zip folder in RTC (6.0.2) CM component using Web. They go to the Source-->Stream-->Component and add file to upload the zip folder. We have put two pre-conditions under Team Configurations-->Operation Behavior:

1.  Deliver (server)

• Require work items and comments: Both associating a work item and writing comment is mandatory
  

     2.  Deliver Phase 2 (server)

•  Restrict changes by Item Name: The uploaded zip file should follow a naming convention
  

When a developer browse the artifact, associates a work item, writes a comment and click on save, RTC gives error if the name of the file is not matching the regex. At the same time, when  I go and look at the associated work item under the links tab, it is showing that change set which had error because of unmatched naming pattern. I want to avoid showing the change set   under the work item if I had any sort of error while saving the artifact.

Appreciate your support in resolving this matter.

Thanks & Regards,

Usman