diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 35abf30272..a4b8887ebd 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -105,7 +105,9 @@ else:
         os.makedirs(config_dir, mode=CONFIG_DIR_MODE)
     except:
         pass
-    if not os.access(config_dir, os.W_OK) or not os.access(config_dir, os.X_OK):
+    if not os.path.exists(config_dir) or \
+            not os.access(config_dir, os.W_OK) or not \
+            os.access(config_dir, os.X_OK):
         print 'No write acces to', config_dir, 'using a temporary dir instead'
         import tempfile, atexit
         config_dir = tempfile.mkdtemp(prefix='calibre-config-')
diff --git a/src/calibre/ebooks/metadata/amazon.py b/src/calibre/ebooks/metadata/amazon.py
index 81d996c6a7..1ee77fec39 100644
--- a/src/calibre/ebooks/metadata/amazon.py
+++ b/src/calibre/ebooks/metadata/amazon.py
@@ -49,13 +49,12 @@ def get_social_metadata(title, authors, publisher, isbn):
         return mi
     br = browser()
     asin = to_asin(br, isbn)
-    if asin:
-        if get_metadata(br, asin, mi):
-            return mi
+    if asin and get_metadata(br, asin, mi):
+        return mi
     from calibre.ebooks.metadata.xisbn import xisbn
     for i in xisbn.get_associated_isbns(isbn):
         asin = to_asin(br, i)
-        if get_metadata(br, asin, mi):
+        if asin and get_metadata(br, asin, mi):
             return mi
     return mi