Safe connection (4/17)

Safe connection