diff --git a/src/main/kotlin/ee/carlrobert/codegpt/util/BaseConverter.kt b/src/main/kotlin/ee/carlrobert/codegpt/util/BaseConverter.kt
index 67e2ea445..cec7fbfbb 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/util/BaseConverter.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/util/BaseConverter.kt
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.intellij.util.xmlb.Converter
 
-abstract class BaseConverter<T> protected constructor(private val typeReference: TypeReference<T>) : Converter<T?>() {
+abstract class BaseConverter<T> protected constructor(private val typeReference: TypeReference<T>) : Converter<T>() {
   private val objectMapper: ObjectMapper = ObjectMapper()
     .registerModule(Jdk8Module())
     .registerModule(JavaTimeModule())
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/util/MapConverter.kt b/src/main/kotlin/ee/carlrobert/codegpt/util/MapConverter.kt
index 753d9f6a0..52972b909 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/util/MapConverter.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/util/MapConverter.kt
@@ -2,4 +2,4 @@ package ee.carlrobert.codegpt.util
 
 import com.fasterxml.jackson.core.type.TypeReference
 
-class MapConverter : BaseConverter<Map<String?, Any?>?>(object : TypeReference<Map<String?, Any?>?>() {})
+class MapConverter : BaseConverter<Map<String, Any>>(object : TypeReference<Map<String, Any>>() {})