Fix up the StageEncodingFallback logic and error handling