Small fix for error handling and description