diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
index f05b28b538..f573fb1b75 100644
--- a/src/calibre/devices/cybookg3/driver.py
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -32,6 +32,7 @@ class CYBOOKG3(USBMS):
     STORAGE_CARD_VOLUME_LABEL = 'Cybook Gen 3 Storage Card'
     
     EBOOK_DIR_MAIN = "eBooks"
+    EBOOK_DIR_CARD = "eBooks"
     SUPPORTS_SUB_DIRS = True
     
     def upload_books(self, files, names, on_card=False, end_session=True, 
diff --git a/src/calibre/ebooks/metadata/__init__.py b/src/calibre/ebooks/metadata/__init__.py
index 05b624f811..856133d1ce 100644
--- a/src/calibre/ebooks/metadata/__init__.py
+++ b/src/calibre/ebooks/metadata/__init__.py
@@ -21,7 +21,10 @@ def string_to_authors(raw):
     return authors
 
 def authors_to_string(authors):
-    return ' & '.join([a.replace('&', '&&') for a in authors])
+    if authors is not None:
+        return ' & '.join([a.replace('&', '&&') for a in authors])
+    else:
+        return ''
 
 def author_to_author_sort(author):
     tokens = author.split()