Revert "Removed all trace of UnhandledError."

This reverts commit fe9a9f867778935ff36daf3da3c8cecf67280235.