Report errors more clearly.
Cleanup.