diff --git a/core/runtime.jvm/src/kotlin/UninitializedPropertyAccessException.kt b/core/runtime.jvm/src/kotlin/UninitializedPropertyAccessException.kt
index 29e350f8be4..e48c0c6287e 100644
--- a/core/runtime.jvm/src/kotlin/UninitializedPropertyAccessException.kt
+++ b/core/runtime.jvm/src/kotlin/UninitializedPropertyAccessException.kt
@@ -19,9 +19,9 @@ package kotlin
 public class UninitializedPropertyAccessException : RuntimeException {
     constructor()
 
-    constructor(message: String) : super(message)
+    constructor(message: String?) : super(message)
 
-    constructor(message: String, cause: Throwable) : super(message, cause)
+    constructor(message: String?, cause: Throwable?) : super(message, cause)
 
-    constructor(cause: Throwable) : super(cause)
+    constructor(cause: Throwable?) : super(cause)
 }
diff --git a/libraries/stdlib/test/ExceptionTest.kt b/libraries/stdlib/test/ExceptionTest.kt
index 87dd379aed9..40cc7c43aa4 100644
--- a/libraries/stdlib/test/ExceptionTest.kt
+++ b/libraries/stdlib/test/ExceptionTest.kt
@@ -35,9 +35,7 @@ class ExceptionTest {
     @Test fun noSuchElementException() = testCreateException(::NoSuchElementException, ::NoSuchElementException)
 
     @Test fun noWhenBranchMatchedException() = testCreateException(::NoWhenBranchMatchedException, ::NoWhenBranchMatchedException, ::NoWhenBranchMatchedException, ::NoWhenBranchMatchedException)
-
-    // TODO: Sort out with nullability of the parameters
-    //    @Test fun uninitializedPropertyAccessException() = testCreateException(::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException)
+    @Test fun uninitializedPropertyAccessException() = testCreateException(::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException)
 
     @Test fun assertionError() = testCreateException(::AssertionError, ::AssertionError, ::AssertionError)