diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksAdapter.java b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksAdapter.java
index 7b104dff8..bc4de4ea1 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksAdapter.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksAdapter.java
@@ -80,7 +80,7 @@ class BookmarksAdapter extends RecyclerView.Adapter<BookmarksAdapter.Item> {
     boolean onItemLongClick(ImageView favicon, BookmarkItem bookmark);
   }
 
-  class Item extends RecyclerView.ViewHolder {
+  static class Item extends RecyclerView.ViewHolder {
     @BindView(R2.id.favicon)
     ImageView favicon;
     @BindView(R2.id.title)
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksPresenter.java b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksPresenter.java
index 4d2b40a5a..50a80544e 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksPresenter.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksPresenter.java
@@ -26,6 +26,7 @@ import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
 import java.util.List;
 import javax.inject.Inject;
+import org.jetbrains.annotations.NotNull;
 import org.kiwix.kiwixmobile.core.base.BasePresenter;
 import org.kiwix.kiwixmobile.core.data.DataSource;
 import org.kiwix.kiwixmobile.core.di.qualifiers.Computation;
@@ -61,7 +62,9 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
 
         @Override
         public void onSuccess(List<BookmarkItem> bookmarks) {
-          view.updateBookmarksList(bookmarks);
+          if (view != null) {
+            view.updateBookmarksList(bookmarks);
+          }
         }
 
         @Override
@@ -72,7 +75,7 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
   }
 
   @Override
-  public void filterBookmarks(List<BookmarkItem> bookmarks, String newText) {
+  public void filterBookmarks(@NotNull List<BookmarkItem> bookmarks, @NotNull String newText) {
     Observable.fromIterable(bookmarks)
       .filter(
         bookmark -> bookmark.getBookmarkTitle().toLowerCase().contains(newText.toLowerCase()))
@@ -87,7 +90,9 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
 
         @Override
         public void onSuccess(List<BookmarkItem> bookmarkList) {
-          view.notifyBookmarksListFiltered(bookmarkList);
+          if (view != null) {
+            view.notifyBookmarksListFiltered(bookmarkList);
+          }
         }
 
         @Override
@@ -98,7 +103,7 @@ class BookmarksPresenter extends BasePresenter<BookmarksContract.View>
   }
 
   @Override
-  public void deleteBookmarks(List<BookmarkItem> deleteList) {
+  public void deleteBookmarks(@NotNull List<BookmarkItem> deleteList) {
     dataSource.deleteBookmarks(deleteList)
       .subscribe(new CompletableObserver() {
         @Override