Safe connection (16/17)

Safe connection