Added connexion checking