[Upg] Enable error handler
[Upg] Cleanup