Tighten up manifest loading error handling