Fixed some issues resulting in a SaddleConnectionError.