diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
index b01b5aef8..0cd4f9daa 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
@@ -84,6 +84,9 @@ public void add(@NonNull Habit habit)
         if (id == null) id = record.save();
         else record.save(id);
 
+        if(id < 0)
+            throw new IllegalArgumentException("habit could not be saved");
+
         habit.setId(id);
         cache.put(id, habit);
     }
diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
index 25d124927..35a0873f4 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/records/HabitRecord.java
@@ -147,6 +147,7 @@ public void copyFrom(Habit model)
         Frequency freq = model.getFrequency();
         this.freqNum = freq.getNumerator();
         this.freqDen = freq.getDenominator();
+        this.reminderDays = 0;
 
         if (model.hasReminder())
         {