Better/more specific error messages on connect Upstream-commit: 0262d40ba7d2edc67077a17aebbcdca1e2472a1e Component: engine