diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06a71e003..e976b8d35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.8.8 (June 21, 2020)
 
 * Make small changes to the habit scheduling algorithm, so that "1 time every x days" habits work more predictably.
+* Fix crash when saving habit
 
 ### 1.8.0 (Jan 1, 2020)
 
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
index ee25dd645..84d75209f 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
@@ -57,7 +57,13 @@ public class TargetPanel extends FrameLayout
     public double getTargetValue()
     {
         String sValue = tvTargetValue.getText().toString();
-        return Double.parseDouble(sValue);
+        double value = 0;
+        try {
+            value = Double.parseDouble(sValue);
+        } catch (NumberFormatException e) {
+            // NOP
+        }
+        return value;
     }
 
     public void setTargetValue(double targetValue)
diff --git a/android/uhabits-android/src/main/play/release-notes/en-US/alpha.txt b/android/uhabits-android/src/main/play/release-notes/en-US/alpha.txt
index b84c5ad40..6cb4c5aa1 100644
--- a/android/uhabits-android/src/main/play/release-notes/en-US/alpha.txt
+++ b/android/uhabits-android/src/main/play/release-notes/en-US/alpha.txt
@@ -1,5 +1,6 @@
 1.8.8
 * Small tweaks to the habit scheduling algorithm
+* Fix some crashes
 1.8:
 * New bar chart showing number of repetitions performed each week, month or year
 * Performing habits on irregular weekdays will no longer break your streak