Catch timeout exceptions on login
Merge pull request #605 from timrae/catchTimeoutExceptions

Catch timeout exceptions on login