Fix message and add additional check to test Upstream-commit: b71cf6938040fc4ae190f3e7eb24d51f756c9e11 Component: engine