diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java
index 09a6c4dc..ba74d5d2 100644
--- a/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java
+++ b/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java
@@ -2,6 +2,9 @@ package com.eu.habbo.habbohotel.commands;
 
 import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
+import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
+
+import java.util.Arrays;
 
 public class WordQuizCommand extends Command {
     public WordQuizCommand() {
@@ -11,21 +14,21 @@ public class WordQuizCommand extends Command {
     @Override
     public boolean handle(GameClient gameClient, String[] params) throws Exception {
         if (!gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasActiveWordQuiz()) {
+            if(params.length == 1) {
+                gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.description.cmd_word_quiz"), RoomChatMessageBubbles.ALERT);
+                return  true;
+            }
             StringBuilder question = new StringBuilder();
             int duration = 60;
 
-            if (params.length > 2) {
-                for (int i = 1; i < params.length - 1; i++) {
-                    question.append(" ").append(params[i]);
-                }
+            try {
+                duration =  Integer.parseInt(params[params.length-1]);
+                params = Arrays.copyOf(params, params.length-1);
+            }
+            catch (Exception e) {}
 
-                try {
-                    duration = Integer.valueOf(params[params.length - 1]);
-                } catch (Exception e) {
-                    question.append(" ").append(params[params.length - 1]);
-                }
-            } else {
-                question = new StringBuilder(params[1]);
+            for (int i = 1; i < params.length; i++) {
+                question.append(" ").append(params[i]);
             }
 
             gameClient.getHabbo().getHabboInfo().getCurrentRoom().startWordQuiz(question.toString(), duration * 1000);