Pass command instead of string to locator
Throw locator-specific exception
Change handler contract to use handle method
Allow Closure for Handler Locator