Merge "Clean up SslError"