diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java
index 1b1c70d824..ee2f696408 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java
@@ -1,23 +1,32 @@
 package com.baeldung.assertexception;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
 public class ExceptionAssertionUnitTest {
     @Test
     public void whenExceptionThrown_thenAssertionSucceeds() {
-        String test = null;
-        assertThrows(NullPointerException.class, () -> {
-            test.length();
+        Exception exception = assertThrows(NumberFormatException.class, () -> {
+            Integer.parseInt("1a");
         });
+
+        String expectedMessage = "For input string";
+        String actualMessage = exception.getMessage();
+
+        assertTrue(actualMessage.contains(expectedMessage));
     }
 
     @Test
     public void whenDerivedExceptionThrown_thenAssertionSucceds() {
-        String test = null;
-        assertThrows(RuntimeException.class, () -> {
-            test.length();
+        Exception exception = assertThrows(RuntimeException.class, () -> {
+            Integer.parseInt("1a");
         });
+
+        String expectedMessage = "For input string";
+        String actualMessage = exception.getMessage();
+
+        assertTrue(actualMessage.contains(expectedMessage));
     }
 }
\ No newline at end of file