Fixed a couple of bugs introduced when adding handling for timeouts
Merge pull request #26 from stormtek/master

Fixed a couple of bugs introduced when adding handling for timeouts