tools-446 make connection errors consistent across all tools.