rose edit: trap upgrade macro errors
Merge pull request #1056 from benfitzpatrick/rose-edit.trap-upgrade-macro-exceptions

rose edit: trap upgrade macro errors