Improve handling of broken/invalid certs. Fixes #11489
(cherry picked from commit 29804b9e6ff07d0224d9396b063f88f486f0d231)
Improve handling of broken/invalid certs. Fixes #11489
(cherry picked from commit 29804b9e6ff07d0224d9396b063f88f486f0d231)