Fix regression with error tooltips (#13695)

Change-Id: Ia076ba95ec3abd6625e81e17bdcf000a20349f4e