Fix up UserException based on feedback.