fix model, error handling stable