Fix some places where low-level errors bubbled up Upstream-commit: 37fdba0428c676786d099feec1ca142fb06ba985 Component: engine