Make sure grit restores old timeout value even if exception occured

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'ensure-timeout-restored' into 'master'

Ensure timeout restored

Fixes #7

See merge request !7