diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt
index 2e60c296fea..fffe948550d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt
@@ -13,7 +13,8 @@ internal inline fun <reified T : Any> ExtraPropertiesExtension.getOrPut(key: Str
         if (!has(key)) {
             set(key, provideValue())
         }
-        get(key) as T
+        val value = get(key) ?: throw NullPointerException("Null extra in for $key")
+        value.castIsolatedKotlinPluginClassLoaderAware()
     }
 }