diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c0d641d..a18bdb4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -69,8 +69,8 @@ tasks.register("generateManifest") {
             "latestApkUrl" to "https://github.com/timklge/karoo-reminder/releases/latest/download/app-release.apk",
             "latestVersion" to android.defaultConfig.versionName,
             "latestVersionCode" to android.defaultConfig.versionCode,
-            "developer" to "timklge",
-            "description" to "Shows in-ride alerts after a given time interval, distance or HR / power / speed / cadence out of range",
+            "developer" to "github.com/timklge",
+            "description" to "Open-source extension that shows in-ride alerts after a given time interval, distance or HR / power / speed / cadence out of range",
             "releaseNotes" to "* Add rolling average setting for power triggers"
         )
 
diff --git a/app/src/main/kotlin/de/timklge/karooreminder/MainActivity.kt b/app/src/main/kotlin/de/timklge/karooreminder/MainActivity.kt
index 350f174..c96dd0a 100644
--- a/app/src/main/kotlin/de/timklge/karooreminder/MainActivity.kt
+++ b/app/src/main/kotlin/de/timklge/karooreminder/MainActivity.kt
@@ -2,15 +2,21 @@ package de.timklge.karooreminder
 
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
 import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.preferencesDataStore
 import de.timklge.karooreminder.screens.ReminderAppNavHost
 import de.timklge.karooreminder.theme.AppTheme
 
-val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
+val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings", corruptionHandler = ReplaceFileCorruptionHandler {
+    Log.w(KarooReminderExtension.TAG, "Error reading settings, using default values")
+    emptyPreferences()
+})
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {