diff --git a/app/src/main/java/org/isoron/uhabits/HabitsApplication.java b/app/src/main/java/org/isoron/uhabits/HabitsApplication.java
index 810620465..accba2f7f 100644
--- a/app/src/main/java/org/isoron/uhabits/HabitsApplication.java
+++ b/app/src/main/java/org/isoron/uhabits/HabitsApplication.java
@@ -66,7 +66,7 @@ public class HabitsApplication extends Application
             if(db.exists()) db.delete();
         }
 
-        DatabaseHelper.initializeActiveAndroid(this);
+        DatabaseHelper.initializeActiveAndroid();
     }
 
     @Override
diff --git a/app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java
index cd411328f..03f66ec5a 100644
--- a/app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java
@@ -149,8 +149,11 @@ public class DatabaseHelper
     }
 
     @SuppressWarnings("unchecked")
-    public static void initializeActiveAndroid(Context context)
+    public static void initializeActiveAndroid()
     {
+        Context context = HabitsApplication.getContext();
+        if(context == null) throw new RuntimeException("application context should not be null");
+
         Configuration dbConfig = new Configuration.Builder(context)
                 .setDatabaseName(getDatabaseFilename())
                 .setDatabaseVersion(BuildConfig.databaseVersion)
diff --git a/app/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java b/app/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
index 74d6dc7bb..8f1d6b433 100644
--- a/app/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
+++ b/app/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
@@ -19,15 +19,12 @@
 
 package org.isoron.uhabits.io;
 
-import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.NonNull;
 
 import com.activeandroid.ActiveAndroid;
 
-import org.isoron.uhabits.BuildConfig;
-import org.isoron.uhabits.HabitsApplication;
 import org.isoron.uhabits.helpers.DatabaseHelper;
 
 import java.io.File;
@@ -57,12 +54,11 @@ public class LoopDBImporter extends AbstractImporter
     public void importHabitsFromFile(@NonNull File file) throws IOException
     {
         ActiveAndroid.dispose();
-        Context context = HabitsApplication.getContext();
         File originalDB = DatabaseHelper.getDatabaseFile();
-        File backupDir = DatabaseHelper.getFilesDir(context, "Backups");
+        File backupDir = DatabaseHelper.getFilesDir("Backups");
 
         DatabaseHelper.saveDatabaseCopy(backupDir);
         DatabaseHelper.copy(file, originalDB);
-        DatabaseHelper.initializeActiveAndroid(context);
+        DatabaseHelper.initializeActiveAndroid();
     }
 }