Fixed potentional NPE in generateTypesFromChoiceCases