diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
index ec08c265f..c6aacaf69 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
@@ -137,8 +137,8 @@ class AddNoteDialog : DialogFragment() {
 
   private val zimNoteDirectoryName: String
     get() {
-      val noteDirectoryName = getTextAfterLastSlashWithoutExtension(zimFileName!!)
-      return (if (noteDirectoryName.isNotEmpty()) noteDirectoryName else zimFileTitle)!!
+      val noteDirectoryName = getTextAfterLastSlashWithoutExtension(zimFileName ?: "")
+      return (if (noteDirectoryName.isNotEmpty()) noteDirectoryName else zimFileTitle) ?: ""
     }
 
   private fun getArticleNotefileName(): String {
@@ -415,7 +415,6 @@ class AddNoteDialog : DialogFragment() {
   }
 
   private fun dismissAddNoteDialog() {
-    val dialog = dialog
     dialog?.dismiss()
     closeKeyboard()
   }