Add nil check to unit_chooser