MDL-32438 choice: fix fatal error on making choice