fixxref/rebase: move the exception handling to the common module