Revert "Catching of timeout is not needed anymore"

This reverts commit 14dccc4cfe6d18d86e6bfb00c2101f68ea5d1693.