diff --git a/src/main/java/InnaIrcBot/BotStart.java b/src/main/java/InnaIrcBot/BotStart.java
index df23c9c..be3baf6 100644
--- a/src/main/java/InnaIrcBot/BotStart.java
+++ b/src/main/java/InnaIrcBot/BotStart.java
@@ -19,13 +19,14 @@ public class BotStart {
                     new Connections(args);
                 } else if (args[0].equals("--generate") || args[0].equals("-g")) {
                     StorageReader.generateDefaultConfig(args[1]);
-                } else if (args[0].equals("--version") || args[0].equals("-v")) {
-                    System.out.println(GlobalData.getAppVersion());
                 }
             }
             else if (args[0].equals("--generate") || args[0].equals("-g")){
                 StorageReader.generateDefaultConfig(null);
             }
+            else if (args[0].equals("--version") || args[0].equals("-v")) {
+                System.out.println(GlobalData.getAppVersion());
+            }
         }
         else {
             System.out.println("Usage:\n"
diff --git a/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java b/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java
index 2ac78b4..8a8bc4b 100644
--- a/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java
+++ b/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java
@@ -27,7 +27,7 @@ public class PrivateMsgCommander {                                          // T
                     case "tell":
                         if ((cmd.length == 2) && (cmd[1].split("(\\s)|(\t)+?",2).length == 2)) {
                             String[] tellArgs = cmd[1].split("(\\s)|(\t)+?", 2);
-                            tell(tellArgs[0], tellArgs[1]);
+                            tell(tellArgs[0], tellArgs[1].trim());
                         }
                         else
                             tell(simplifyNick(sender), "Pattern: tell <nick> <message>");