Handle timeout exceptions in FileContainer
Better catch the exception where it actually occurs
Merge branch 'handle-timeout' into sdss-timeout
Add tests for timeouts