Add non-nil check before logging volume errors. Upstream-commit: 08544b1912734d31dac9632e9bfba07ed9601ff4 Component: engine