From b3e649d1b3c2f490efbb4db9e9f2cc8601934284 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Tue, 30 Dec 2014 16:53:03 +0100
Subject: [PATCH] Don't catch that many exceptions

---
 vdirsyncer/storage/dav.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
index f0af3fa..7ed8c57 100644
--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@@ -13,6 +13,7 @@ import itertools
 from lxml import etree
 
 from requests import session as requests_session
+from requests.exception import RequestException
 
 from .base import Item, Storage
 from .http import USERAGENT, prepare_auth, prepare_verify
@@ -70,7 +71,7 @@ def _catch_generator_exceptions(f):
         try:
             for x in f(*args, **kwargs):
                 yield x
-        except Exception:
+        except RequestException:
             import traceback
             dav_logger.debug(traceback.format_exc())
     return inner
@@ -121,8 +122,9 @@ class Discover(object):
     @_catch_generator_exceptions
     def _find_dav(self):
         response = self.session.request('GET', self._well_known_uri,
-                                        allow_redirects=False)
-        yield response.headers['Location']
+                                        allow_redirects=False,
+                                        is_subpath=False)
+        yield response.headers.get('Location', '')
 
     def discover(self):
         """discover all the user's CalDAV or CardDAV collections on the server