[PATCH v2 21/36] expo: Correct some swallowed errors in scene