add in propagation of exceptions (bug 974164)
Merge pull request #1776 from andymckay/974164

add in propagation of exceptions (bug 974164)