Merge "Handle manifest parse errors in main"