diff --git a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java
index a8918ab..b7f9039 100644
--- a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java
+++ b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java
@@ -128,7 +128,11 @@
         booksViewModel.getBookLiveData().observe(getViewLifecycleOwner(), new Observer<HashMap<Integer, Book>>() {
             @Override
             public void onChanged(HashMap<Integer, Book> integerBookHashMap) {
-                bookList = new ArrayList<>(integerBookHashMap.values());
+                if(integerBookHashMap != null){
+                    bookList = new ArrayList<>(integerBookHashMap.values());
+                }else{
+                    bookList = new ArrayList<>();
+                }
                 bookAdapter.setBooks(bookList);
             }
         });