add in propagation of exceptions (bug 974164)