Safe connection (8/17)

Safe connection