fixed comboBox selection and nullpointer