Don't swallow TimeoutErrors
Use a somewhat cleaner syntax