diff --git a/src/main/java/me/channa/jmstool/JmsTool.java b/src/main/java/me/channa/jmstool/JmsTool.java
index 60eac53..0fe0712 100644
--- a/src/main/java/me/channa/jmstool/JmsTool.java
+++ b/src/main/java/me/channa/jmstool/JmsTool.java
@@ -52,6 +52,7 @@ public static void main(String[] args) {
         if (command == null) {
             LOGGER.error("Invalid arguments, please send correct arguments");
             helpCommand.execute(jCommander);
+            return;
         }
 
         switch (command) {
diff --git a/src/main/java/me/channa/jmstool/commands/ConsumeCommand.java b/src/main/java/me/channa/jmstool/commands/ConsumeCommand.java
index f0e6a25..2055200 100644
--- a/src/main/java/me/channa/jmstool/commands/ConsumeCommand.java
+++ b/src/main/java/me/channa/jmstool/commands/ConsumeCommand.java
@@ -87,14 +87,14 @@ public void execute(JCommander jCommander) {
                     while (messagePropertyNames.hasMoreElements()) {
                         String propertyName = messagePropertyNames.nextElement().toString();
                         stringBuilder
+                                .append("[JMS-PROPERTY] ")
                                 .append(propertyName)
                                 .append(":")
                                 .append(message.getStringProperty(propertyName))
                                 .append("\n");
                     }
 
-                    stringBuilder.append("message")
-                            .append(":")
+                    stringBuilder.append("[JMS-MESSAGE]: ")
                             .append(((TextMessage) message).getText());
 
                     LOGGER.info(stringBuilder.toString());
diff --git a/src/main/java/me/channa/jmstool/commands/PublishCommand.java b/src/main/java/me/channa/jmstool/commands/PublishCommand.java
index e14a274..5de1b8d 100644
--- a/src/main/java/me/channa/jmstool/commands/PublishCommand.java
+++ b/src/main/java/me/channa/jmstool/commands/PublishCommand.java
@@ -67,10 +67,10 @@ public void execute(JCommander jCommander) {
 
             // Iterate over the number of message count to receive
             for (int i = 0; i < count; i++) {
-                TextMessage jmsMessage = queueSession.createTextMessage(String.format(message, i));
+                TextMessage jmsMessage = queueSession.createTextMessage(String.format(message, i + 1));
                 producer.send(jmsMessage);
 
-                LOGGER.info(String.format("Message publish with text: %s", String.format(message, i)));
+                LOGGER.info(String.format("Message publish with text: %s", String.format(message, i + 1)));
             }
 
         } catch (NamingException | JMSException exception) {