Don't exit on error, etc...
Cleanup.
Bug fix.