diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt
index ef5410231e..867a2e2dd2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt
@@ -147,7 +147,9 @@ class DatabaseTableDebugFragment : AbstractDebugFragment() {
                 cursor.use {
                     while (it.moveToNext()) {
                         if (it.getColumnIndex("sql") >= 0) {
-                            sqlQueries.add(formatSql(it.getString(it.getColumnIndexOrThrow("sql")).trim()) + ";")
+                            it.getString(it.getColumnIndexOrThrow("sql"))?.let { rawSql ->
+                                sqlQueries.add(formatSql(rawSql.trim()) + ";")
+                            }
                         }
                     }
                 }