fix NPE
upload shouldn't be immediate
add empty option if combo box isn't required