diff --git a/core-kotlin-modules/core-kotlin-lang-2/src/main/kotlin/com/baeldung/exceptionhandling/ExceptionHandling.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/exceptionhandling/ExceptionHandling.kt
similarity index 93%
rename from core-kotlin-modules/core-kotlin-lang-2/src/main/kotlin/com/baeldung/exceptionhandling/ExceptionHandling.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/exceptionhandling/ExceptionHandling.kt
index 225a1339e2..6689ab43e4 100644
--- a/core-kotlin-modules/core-kotlin-lang-2/src/main/kotlin/com/baeldung/exceptionhandling/ExceptionHandling.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/exceptionhandling/ExceptionHandling.kt
@@ -75,6 +75,11 @@ class ExceptionHandling {
         else return message.length
     }
 
+    fun throwExpression(): Int? {
+        val message: String? = null
+        return message?.length ?: throw IllegalArgumentException("String is null")
+    }
+
     @Throws(IOException::class)
     fun throwsAnnotation(): String?{
         val filePath = null
diff --git a/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/exceptionhandling/ExceptionHandlingUnitTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/exceptionhandling/ExceptionHandlingUnitTest.kt
similarity index 88%
rename from core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/exceptionhandling/ExceptionHandlingUnitTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/exceptionhandling/ExceptionHandlingUnitTest.kt
index 49ad3c38e0..af7aa4406f 100644
--- a/core-kotlin-modules/core-kotlin-lang-2/src/test/kotlin/com/baeldung/exceptionhandling/ExceptionHandlingUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/exceptionhandling/ExceptionHandlingUnitTest.kt
@@ -39,6 +39,11 @@ class ExceptionHandlingUnitTest {
         assertThrows<IllegalArgumentException> { classUnderTest.throwKeyword() }
     }
 
+    @Test
+    fun givenIllegalArgument_whenElvisExpressionUsed_thenThrowsException(){
+        assertThrows<IllegalArgumentException> { classUnderTest.throwExpression() }
+    }
+
     @Test
     fun whenAnnotationUsed_thenThrowsException(){
         assertThrows<IOException> { classUnderTest.throwsAnnotation() }