More safety on client comm