Upgrade failed from 2.x to 3.1

Hello gentlemen,

I'm getting a webform_emails error trying to go from 2.6 to 3.1:
"
Drupal database update
user warning: Duplicate column name 'excluded_components' query: ALTER TABLE drup_webform_emails ADD `excluded_components` TEXT DEFAULT NULL in xxxx/includes/database.mysql-common.inc on line 298.
"
The following queries were executed
webform module
"
Update #6308
Failed: ALTER TABLE {webform_emails} ADD `excluded_components` TEXT DEFAULT NULL
UPDATE {webform_emails} SET excluded_components = '%s' ()
ALTER TABLE {webform_emails} CHANGE `excluded_components` `excluded_components` TEXT NOT NULL
ALTER TABLE {webform_component} DROP email
"

Not only does it fail but it brings the whole site down!

Really appreciate any insight or suggestions, I've checked the table and it doesnt appear to be corrupted (even tried to repair it for good measure) ... come to think of it, it wasnt sending messages to the first e-mail address listed at one point, dont know if its related.

This was on a first attempt to update after enabling the version 3.1 module. I've tried several times on fresh backups made before installing the new module version.

Thanks in advance, you help is appreciated!
-Pjo