Rethrow underlying exceptions.
Merge pull request #1193 from Lukasa/timeout_exception

Throw more informative exceptions.