fixed using nil base product when registration failed (bnc#873683)

- register the base product again if it failed
- 3.1.35