Added exception handling to the choice-variable.