Fixed a null pointer exception in the roulette wheel selection
merged with hiro branch