No.  I will take it up with the Church as I believe Jesus would be more compassionate than the Catholic Church is being.  Shoving away someone who is abused and telling too bad that his/ her first spouse was abusive and punishing them for it is not how Jesus would treat these people.  

As for the annulment system, it is a maze of bureaucracy and red tape that has no place in a spiritual organization meant to welcome all.  An abusive spouse might not want to have to deal with his/her ex abuser.  (And I know of cases where the former abusers have dragged annulments out for years just to continue to harm and control their exes and the annulment tribunal is set up in such a way that it makes it really easy to aid them in this.  It is really a great aid to abusive spouses.)