From 6deb1383200e4decf25a5f770a2fb30e4b8911eb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 28 Oct 2012 08:13:27 +0530
Subject: [PATCH] ...

---
 src/calibre/devices/mtp/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py
index 1584a3bf93..bc55654b1e 100644
--- a/src/calibre/devices/mtp/driver.py
+++ b/src/calibre/devices/mtp/driver.py
@@ -114,7 +114,7 @@ class MTP_DEVICE(BASE):
             except:
                 prints('Failed to load existing driveinfo.calibre file, with error:')
                 traceback.print_exc()
-                dinfo = None
+                dinfo = {}
         if dinfo.get('device_store_uuid', None) is None:
             dinfo['device_store_uuid'] = unicode(uuid.uuid4())
         if dinfo.get('device_name', None) is None: