diff --git a/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java b/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java
index 95a314480f..6c58763143 100644
--- a/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java
+++ b/lombok/src/main/java/com/baeldung/lombok/builder/customsetter/Message.java
@@ -32,7 +32,7 @@ public class Message {
 
         private void verifyTextOrFile() {
             if (text != null && file != null) {
-                throw new IllegalArgumentException("Cannot send 'text' and 'file'.");
+                throw new IllegalStateException("Cannot send 'text' and 'file'.");
             }
         }
     }
diff --git a/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java b/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java
index 3f7f276edf..3143747f0d 100644
--- a/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java
+++ b/lombok/src/test/java/com/baeldung/lombok/builder/customsetter/BuilderWithCustomSetterUnitTest.java
@@ -24,7 +24,7 @@ public class BuilderWithCustomSetterUnitTest {
             .build();
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = IllegalStateException.class)
     public void givenBuilderWithCustomSetter_TestTextAndFile() {
         Message message = Message.builder()
             .sender("user@somedomain.com")