diff --git a/core-java/src/main/java/com/baeldung/throwsexception/PersonRepository.java b/core-java/src/main/java/com/baeldung/throwsexception/PersonRepository.java
index 5fcbeb3d5f..a3e69b7f6f 100644
--- a/core-java/src/main/java/com/baeldung/throwsexception/PersonRepository.java
+++ b/core-java/src/main/java/com/baeldung/throwsexception/PersonRepository.java
@@ -8,7 +8,7 @@ public class PersonRepository {
 
     @Nullable
     public String findNameById(String id) {
-        return id == null ? null : "example-name";
+        return id == null ? null : "Name";
     }
 
     public List<String> findAll() throws SQLException {
diff --git a/core-java/src/test/java/com/baeldung/throwsexception/PersonRepositoryUnitTest.java b/core-java/src/test/java/com/baeldung/throwsexception/PersonRepositoryUnitTest.java
index 6294d40090..0d1859fb1a 100644
--- a/core-java/src/test/java/com/baeldung/throwsexception/PersonRepositoryUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/throwsexception/PersonRepositoryUnitTest.java
@@ -4,6 +4,7 @@ import org.junit.Test;
 
 import java.util.Optional;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -29,4 +30,14 @@ public class PersonRepositoryUnitTest {
                                 .orElseThrow(Exception::new));
     }
 
+    @Test
+    public void whenIdIsNonNull_thenShouldReturnNameUpperCase() throws Exception {
+        String name = Optional
+                .ofNullable(personRepository.findNameById("id"))
+                .map(String::toUpperCase)
+                .orElseThrow(Exception::new);
+
+        assertEquals("NAME", name);
+    }
+
 }
\ No newline at end of file