diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
index ba3c5565d..6bc86eaaa 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt
@@ -34,13 +34,20 @@ class HabitsDatabaseOpener(
 ) : SQLiteOpenHelper(context, databaseFilename, null, version) {
 
     override fun onCreate(db: SQLiteDatabase) {
+        db.disableWriteAheadLogging()
         db.version = 8
         onUpgrade(db, -1, version)
     }
 
+    override fun onOpen(db: SQLiteDatabase) {
+        super.onOpen(db)
+        db.disableWriteAheadLogging()
+    }
+
     override fun onUpgrade(db: SQLiteDatabase,
                            oldVersion: Int,
                            newVersion: Int) {
+        db.disableWriteAheadLogging()
         if (db.version < 8) throw UnsupportedDatabaseVersionException()
         val helper = MigrationHelper(AndroidDatabase(db))
         helper.migrateTo(newVersion)
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
index b74c33915..fc528849e 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java
@@ -66,7 +66,7 @@ public class ExportDBTask implements Task
         }
         catch (IOException e)
         {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }