diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java
index c691b345..4ff3ddb0 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.java
@@ -117,10 +117,10 @@ public class CalendarSyncManager extends SyncManager {
         // fetch list of remote VEVENTs and build hash table to index file name
         davCalendar().calendarQuery("VEVENT");
         remoteResources = new HashMap<>(davCollection.members.size());
-        for (DavResource vCard : davCollection.members) {
-            String fileName = vCard.fileName();
+        for (DavResource iCal : davCollection.members) {
+            String fileName = iCal.fileName();
             log.debug("Found remote VEVENT: " + fileName);
-            remoteResources.put(fileName, vCard);
+            remoteResources.put(fileName, iCal);
         }
     }
 
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
index 8b76ab1f..dfb89bcc 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
@@ -118,9 +118,11 @@ public class ContactsSyncManager extends SyncManager {
             davAddressBook().addressbookQuery();
         } catch(HttpException e) {
             if (e.status/100 == 4) {
-                log.warn("Server error on REPORT addressbook query, falling back to PROPFIND", e);
+                log.warn("Server error on REPORT addressbook-query, falling back to PROPFIND", e);
                 davAddressBook().propfind(1, GetETag.NAME);
-            }
+            } else
+                // no defined fallback, pass through exception
+                throw e;
         }
 
         remoteResources = new HashMap<>(davCollection.members.size());
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
index 9b00db39..0349ad1a 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
@@ -437,7 +437,7 @@ abstract public class SyncManager {
 
         // add all unseen (= remotely added) remote contacts
         if (!remoteResources.isEmpty()) {
-            log.info("New VCards have been found on the server: " + TextUtils.join(", ", remoteResources.keySet()));
+            log.info("New resources have been found on the server: " + TextUtils.join(", ", remoteResources.keySet()));
             toDownload.addAll(remoteResources.values());
         }
     }
diff --git a/dav4android b/dav4android
index 8064d17d..f254b6e0 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 8064d17d934345adf4dbec66b73c5c8fdb8046c1
+Subproject commit f254b6e0faf10dc74d7849b77281cffcacb7774d
diff --git a/vcard4android b/vcard4android
index 1077033b..0d84afa1 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 1077033b256aade6e6f66931878f908cd13067a5
+Subproject commit 0d84afa1680c1ef35db52d63c4eee0b23607dd2b