re #1105: made the fix to Upsell less generalized. Allowing 'user_choice' as an option. Also, updated error messages to make them more intelligible.