Now does not crashes anymore when the connection cannot be established. Even retries!
Merge branch 'master' into web