Added some more timeout exception handling.