Small fixes for timeouts and error messages.
Add recovered file handle to the list of active sources.
Merge pull request #3538 from bbockelm/multisource-bugfixes

Multisource bugfixes