Fix for NoneType addition bug
Handle unicode key lookups in shelve