diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..4f0323dc
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,20 @@
+image: registry.gitlab.com/bitfireat/davdroid:latest
+
+before_script:
+  - export GRADLE_USER_HOME=`pwd`/.gradle
+  - chmod +x gradlew
+  - emulator64-arm -avd test -no-skin -no-audio -no-window & wait-for-emulator.sh
+
+cache:
+  paths:
+     - .gradle/wrapper
+     - .gradle/caches
+
+test:
+  script:
+    - ./gradlew -i check mergeAndroidReports
+  artifacts:
+    paths:
+      - app/build/outputs/lint-results-debug.html
+      - app/build/reports
+      - build/reports
diff --git a/README.md b/README.md
index fe6cd066..9dee254c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 
+[![build status](https://gitlab.com/bitfireAT/davdroid/badges/master/build.svg)](https://gitlab.com/bitfireAT/davdroid/commits/master)
+
+
 DAVdroid
 ========
 
@@ -31,4 +34,3 @@ Those libraries are used by DAVdroid (alphabetically):
 * [iCal4j](http://ical4j.sourceforge.net/) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)
 * [okhttp](https://square.github.io/okhttp/) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license)
 * [Project Lombok](http://projectlombok.org/) – [MIT License](http://opensource.org/licenses/mit-license.php)
-* [SLF4J](http://www.slf4j.org/) – [MIT License](http://www.slf4j.org/license.html)
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
index 8e01f52b..67f617c8 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
@@ -17,6 +17,7 @@ import android.content.SyncResult;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Bundle;
 import android.provider.CalendarContract;
@@ -68,10 +69,10 @@ public class CalendarsSyncAdapterService extends SyncAdapterService {
                     CalendarSyncManager syncManager = new CalendarSyncManager(getContext(), account, settings, extras, authority, syncResult, calendar);
                     syncManager.performSync();
                 }
-            } catch (CalendarStorageException e) {
-                App.log.log(Level.SEVERE, "Couldn't enumerate local calendars", e);
+            } catch(CalendarStorageException|SQLiteException e) {
+                App.log.log(Level.SEVERE, "Couldn't prepare local calendars", e);
                 syncResult.databaseError = true;
-            } catch (InvalidAccountException e) {
+            } catch(InvalidAccountException e) {
                 App.log.log(Level.SEVERE, "Couldn't get account settings", e);
             }
 
diff --git a/cert4android b/cert4android
index 489056f7..e4dc9800 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit 489056f740ba8d7ccddaa99d29162e11651116bb
+Subproject commit e4dc98008708b399aafba1190ef1f3f4a09d8180
diff --git a/dav4android b/dav4android
index 4e550cdc..7e8cbcfd 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 4e550cdcda7c2b3c969d20f1a99770deafafd6e8
+Subproject commit 7e8cbcfd6e959b9ed55fdaf434c7a3401630d6b5
diff --git a/ical4android b/ical4android
index 85f4d947..9c6d977a 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit 85f4d947089ac3e0b7a61cbedfc69dd6ec7f235d
+Subproject commit 9c6d977a54a53903f7240a4028170193276a1e44
diff --git a/vcard4android b/vcard4android
index 788eedf4..b695eab1 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 788eedf46672b6266fabe65e42cf07e0396627bf
+Subproject commit b695eab1b14651190f60f63eb6aebd1f9e5b89f6