- Fix problem with component locator. 
- Distinguish mapping errors.