deal with empty addon lists and default options better

fixes #936