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 3873b4ad8..f2289af65 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
@@ -87,7 +87,7 @@ public class HabitBullCSVImporter extends AbstractImporter
             {
                 h = modelFactory.buildHabit();
                 h.setName(name);
-                h.setDescription(description);
+                h.setDescription(description == null ? "" : 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 1f0299f40..ac0d83c79 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
@@ -101,7 +101,7 @@ public class RewireDBImporter extends AbstractImporter
 
                 Habit habit = modelFactory.buildHabit();
                 habit.setName(name);
-                habit.setDescription(description);
+                habit.setDescription(description == null ? "" : 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 af7ecb993..e1a0f2508 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
@@ -127,7 +127,7 @@ public class TickmateDBImporter extends AbstractImporter
 
                 Habit habit = modelFactory.buildHabit();
                 habit.setName(name);
-                habit.setDescription(description);
+                habit.setDescription(description == null ? "" : 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 09456d627..a290b56d9 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(@Nullable String description)
+    public synchronized void setDescription(@NonNull String description)
     {
-        data.description = description == null ? "" : description;
+        data.description = description;
     }
 
     @NonNull
diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
index 2513aeffd..a7b490b24 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java
@@ -226,7 +226,7 @@ public class HabitListTest extends BaseUnitTest
         Habit h2 = fixtures.createEmptyHabit();
         h2.setName("Wake up early");
         h2.setQuestion("Did you wake up before 6am?");
-        h2.setDescription(null);
+        h2.setDescription("");
         h2.setFrequency(new Frequency(2, 3));
         h2.setColor(5);