diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
index dbf892166..3873b4ad8 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java
@@ -67,7 +67,7 @@ public class HabitBullCSVImporter extends AbstractImporter
             String name = line[0];
             if (name.equals("HabitName")) continue;
 
-            String question = line[1];
+            String description = line[1];
             String dateString[] = line[3].split("-");
             int year = Integer.parseInt(dateString[0]);
             int month = Integer.parseInt(dateString[1]);
@@ -87,7 +87,7 @@ public class HabitBullCSVImporter extends AbstractImporter
             {
                 h = modelFactory.buildHabit();
                 h.setName(name);
-                h.setQuestion(question);
+                h.setDescription(description);
                 h.setFrequency(Frequency.DAILY);
                 habitList.add(h);
                 map.put(name, h);
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
index 10136f1df..1f0299f40 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java
@@ -92,7 +92,7 @@ public class RewireDBImporter extends AbstractImporter
             {
                 int id = c.getInt(0);
                 String name = c.getString(1);
-                String question = c.getString(2);
+                String description = c.getString(2);
                 int schedule = c.getInt(3);
                 String activeDays = c.getString(4);
                 int repeatingCount = c.getInt(5);
@@ -101,7 +101,7 @@ public class RewireDBImporter extends AbstractImporter
 
                 Habit habit = modelFactory.buildHabit();
                 habit.setName(name);
-                habit.setQuestion(question);
+                habit.setDescription(description);
 
                 int periods[] = { 7, 31, 365 };
                 int numerator, denominator;
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
index 2e9b9462d..af7ecb993 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java
@@ -123,11 +123,11 @@ public class TickmateDBImporter extends AbstractImporter
             {
                 int id = c.getInt(0);
                 String name = c.getString(1);
-                String question = c.getString(2);
+                String description = c.getString(2);
 
                 Habit habit = modelFactory.buildHabit();
                 habit.setName(name);
-                habit.setQuestion(question);
+                habit.setDescription(description);
                 habit.setFrequency(Frequency.DAILY);
                 habitList.add(habit);
 
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
index a290b56d9..09456d627 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
@@ -148,9 +148,9 @@ public class Habit
         return data.description;
     }
 
-    public synchronized void setDescription(@NonNull String description)
+    public synchronized void setDescription(@Nullable String description)
     {
-        data.description = description;
+        data.description = description == null ? "" : description;
     }
 
     @NonNull
diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
index 820ff5933..73671d7e7 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java
@@ -52,7 +52,7 @@ public class ImportTest extends BaseUnitTest
 
         Habit habit = habitList.getByPosition(0);
         assertThat(habit.getName(), equalTo("Breed dragons"));
-        assertThat(habit.getQuestion(), equalTo("with love and fire"));
+        assertThat(habit.getDescription(), equalTo("with love and fire"));
         assertThat(habit.getFrequency(), equalTo(Frequency.DAILY));
         assertTrue(containsRepetition(habit, 2016, 3, 18));
         assertTrue(containsRepetition(habit, 2016, 3, 19));