Handle timeout exceptions in FileContainer
Better catch the exception where it actually occurs
Merge pull request #262 from loicseguin/handle-timeout

Handle timeout in FileContainer