diff --git a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
index e8e48ca..82ffad8 100644
--- a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
+++ b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
@@ -447,7 +447,7 @@ public class BookmarkManager {
      *
      * @return the current folder
      */
-    @Nullable
+    @NonNull
     public String getCurrentFolder() {
         return mCurrentFolder;
     }
diff --git a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java
index c0c6626..137f295 100644
--- a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java
+++ b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java
@@ -63,7 +63,7 @@ public class HistoryItem implements Comparable<HistoryItem> {
         this.mImageId = id;
     }
 
-    public void setBitmap(Bitmap image) {
+    public void setBitmap(@Nullable Bitmap image) {
         mBitmap = image;
     }