Fixes 580 pr

Submitting this as a simple fix to the pull request 580 which changed disregarded to unwatched.  SMF's upgrade script gracefully handles database errors.

I don't have the capacity to test the PostgreSQL or sqlite changes, but the code is based on other similar parts of our upgrade scripts and thus should work.  Please let me know if they need adjusted though.