Fixed aborting while adding the add-on/extension

- bnc#886662
- manually tested
- auto-test will be (hopefully) covered by @lslezak refactoring