diff --git a/CHANGELOG b/CHANGELOG
index cdd4e35d0..1b39f0cee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.9.19.1 / 2015-04-15 / ed86e7e85161dbe3f15932fd4d195c551f8e2c71
+ * Fixed crash when opening advanced settings
+
 0.9.19 / 2015-04-13 / 3cfb748946a5876dc06d5f81d811b142a88846f7
  * Made internal state handling more stable
  * Added graceful shutdown support
diff --git a/app/build.gradle b/app/build.gradle
index 6f8b0b615..76665e26a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,8 +5,8 @@ android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION as String
     defaultConfig {
-        versionCode 4745227
-        versionName '0.9.19'
+        versionCode 4745229
+        versionName '0.9.19.1'
         minSdkVersion 9
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
 
diff --git a/app/src/main/java/net/i2p/android/router/util/IntListPreference.java b/app/src/main/java/net/i2p/android/router/util/IntListPreference.java
index b0caefafb..8f3f6ece8 100644
--- a/app/src/main/java/net/i2p/android/router/util/IntListPreference.java
+++ b/app/src/main/java/net/i2p/android/router/util/IntListPreference.java
@@ -15,6 +15,15 @@ public class IntListPreference extends ListPreference {
 
     @Override
     protected boolean persistString(String value) {
+        if (getSharedPreferences().contains(getKey())) {
+            try {
+                getPersistedInt(0);
+            } catch (ClassCastException e) {
+                // Fix for where this preference was previously stored in a ListPreference
+                getSharedPreferences().edit().remove(getKey()).commit();
+            }
+        }
+
         return value != null && persistInt(Integer.valueOf(value));
     }
 
@@ -25,7 +34,7 @@ public class IntListPreference extends ListPreference {
                 int intValue = getPersistedInt(0);
                 return String.valueOf(intValue);
             } catch (ClassCastException e) {
-                return getPersistedString("0");
+                return super.getPersistedString("0");
             }
         } else {
             return defaultReturnValue;
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 393b44f80..c5e7b9aaf 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -23,6 +23,7 @@
   <string name="label_graphs">Gráficos</string>
   <string name="button_router_off">Pressionar longo para iniciar I2P</string>
   <string name="button_router_on">I2P está em execução (pressionar longo para para)</string>
+  <string name="button_router_graceful">I2P será desligado em %s</string>
   <!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
   <string name="char_client_tunnel">C</string>
   <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->