diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
index 64df0da458..ce338fe82d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
@@ -69,10 +69,10 @@ public final class QueueConfig {
 
       private void validateState() {
          if (isEmptyOrNull(this.name)) {
-            throw new IllegalStateException("name can't be null!");
+            throw new IllegalStateException("name can't be null or empty!");
          }
          if (isEmptyOrNull(this.address)) {
-            throw new IllegalStateException("address can't be null!");
+            throw new IllegalStateException("address can't be null or empty!");
          }
       }