Fix up the error handlers
Add a license