improver error handling