(2.0) Made sure exceptions are re-thrown at the end

Updated patch from bug 853005 for Mozmill 2.0