diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt
index d64ab16b3..bfb3ec764 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt
@@ -144,8 +144,18 @@ class BookmarkItemsDao @Inject constructor(
      */
     @SuppressLint("Range")
     fun fromCursor(cursor: Cursor) = with(cursor) {
+        var name = getString(COLUMN_NAME)
+        if (name == null) {
+            name = ""
+        }
+
+        var id = getString(COLUMN_ID)
+        if (id == null) {
+            id = ""
+        }
+
         DepictedItem(
-            getString(COLUMN_NAME),
+            name,
             getString(COLUMN_DESCRIPTION),
             getString(COLUMN_IMAGE),
             getStringArray(COLUMN_INSTANCE_LIST),
@@ -155,7 +165,7 @@ class BookmarkItemsDao @Inject constructor(
                 getStringArray(COLUMN_CATEGORIES_THUMBNAIL_LIST)
             ),
             getString(COLUMN_IS_SELECTED).toBoolean(),
-            getString(COLUMN_ID)
+            id
         )
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt
index e30b3160d..00c8e3228 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt
@@ -128,7 +128,10 @@ class BookmarkPicturesDao @Inject constructor(
     }
 
     fun fromCursor(cursor: Cursor): Bookmark {
-        val fileName = cursor.getString(COLUMN_MEDIA_NAME)
+        var fileName = cursor.getString(COLUMN_MEDIA_NAME)
+        if (fileName == null) {
+            fileName = ""
+        }
         return Bookmark(
             fileName, cursor.getString(COLUMN_CREATOR), uriForName(fileName)
         )
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDao.kt b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDao.kt
index e1d0740de..d16d250dd 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDao.kt
+++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDao.kt
@@ -163,11 +163,19 @@ class RecentSearchesDao @Inject constructor(
      * @param cursor
      * @return RecentSearch object
      */
-    fun fromCursor(cursor: Cursor): RecentSearch = RecentSearch(
-        uriForId(cursor.getInt(COLUMN_ID)),
-        cursor.getString(COLUMN_NAME),
-        Date(cursor.getLong(COLUMN_LAST_USED))
-    )
+    fun fromCursor(cursor: Cursor): RecentSearch {
+        var query = cursor.getString(COLUMN_NAME)
+
+        if (query == null) {
+            query = ""
+        }
+
+        return RecentSearch(
+            uriForId(cursor.getInt(COLUMN_ID)),
+            query,
+            Date(cursor.getLong(COLUMN_LAST_USED))
+        )
+    }
 
     /**
      * This class contains the database table architechture for recent searches,