Move to new martini-contrib packages
Clean up error handling