handle connect+register a bit more carefully