Should fix #2223 for realz this time.
Better connection validation for us.