added guard on connection screen