Better error tracking/reporting.
Update unit test to run though handler container.