Comment 1 for bug 890888

The timeout is not caught by the "except (Exception, TimeoutError):"
It can be caught simply by except:

The only way I could propagate the exception ahead, i.e. so the calling function could catch it, is by explicitly raising a different exception.

Not sure what the correct way to do this is.