Clean up error handling.

Merge in changes to the fault library.