Merge "Revert "Handle exception for unknown component names.""