diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b7c07d589..0d0b45294 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.konan.properties.Properties
 import java.io.FileInputStream
@@ -32,9 +31,9 @@ android {
         targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
         versionCode = project.libs.versions.app.version.versionCode.get().toInt()
         versionName = project.libs.versions.app.version.versionName.get()
-        archivesName.set("calendar-$versionCode")
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
+        setProperty("archivesBaseName", "calendar-$versionCode")
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas")
         }
diff --git a/app/src/main/kotlin/org/fossify/calendar/helpers/Converters.kt b/app/src/main/kotlin/org/fossify/calendar/helpers/Converters.kt
index d74d1a8a1..aab84abcf 100644
--- a/app/src/main/kotlin/org/fossify/calendar/helpers/Converters.kt
+++ b/app/src/main/kotlin/org/fossify/calendar/helpers/Converters.kt
@@ -11,8 +11,8 @@ class Converters {
     private val attendeeType = object : TypeToken<List<Attendee>>() {}.type
 
     @TypeConverter
-    fun jsonToStringList(value: String): List<String> {
-        val newValue = if (value.isNotEmpty() && !value.startsWith("[")) {
+    fun jsonToStringList(value: String?): List<String> {
+        val newValue = if (!value.isNullOrEmpty() && !value.startsWith("[")) {
             "[$value]"
         } else {
             value