Component::getComponent exception formatting
Resolve merge conflicts.
Restore improvement to exception.
Merge pull request #266 from chrisdembia/fix-component-exceptions

Component::getComponent exception formatting