Make things more robust

* Trying to set an invalid UUID no longer destroys the valid UUID
* Empty item slots now show up as blank rather than "0 "
Merge pull request #1 from McSimp/master

Merge from upstream
Merge pull request #2 from TwelveBaud/master

Make things more robust