Prevent crash in unpacking due to unset variable.
We're now on 0.7.x, and developing 0.8.x
Merge pull request #160 from sanderjo/0.7.x

We're now on 0.7.x, and developing 0.8.x
Merge remote-tracking branch 'upstream/0.7.x' into 0.7.x