Fix #2 by rescuing timeout (and connection) exceptions