Add another check for empty guid
Merge branch 'master' of https://github.com/OpenBazaar/OpenBazaar