Don't forget to raise the exception ! :)
Merge pull request #349 from zimbatm/raise-timeout

Don't forget to raise the exception ! :)