Added no-connection behavior