More defensive code in License Import Controller
Merge branch '4.1-dev' of github.com:k-int/KBPlus into 4.1-dev