diff --git a/MinecraftClient/Commands/Move.cs b/MinecraftClient/Commands/Move.cs
index e68131d0..7b95750b 100644
--- a/MinecraftClient/Commands/Move.cs
+++ b/MinecraftClient/Commands/Move.cs
@@ -16,6 +16,9 @@ namespace MinecraftClient.Commands
             List<string> args = getArgs(command.ToLower()).ToList();
             bool takeRisk = false;
 
+            if (args.Count < 1)
+                return GetCmdDescTranslated();
+
             if (args.Contains("-f"))
             {
                 takeRisk = true;
diff --git a/MinecraftClient/Commands/SetRnd.cs b/MinecraftClient/Commands/SetRnd.cs
index 7547ed48..efed8db0 100644
--- a/MinecraftClient/Commands/SetRnd.cs
+++ b/MinecraftClient/Commands/SetRnd.cs
@@ -55,7 +55,7 @@ namespace MinecraftClient.Commands
                     else
                     {
                         // extract all arguments of the command
-                        string argString = command.Substring(command.IndexOf(args[0]) + args[0].Length, command.Length - 8 - args[0].Length);
+                        string argString = command.Substring(8 + command.Split(' ')[1].Length);
 
                         // process all arguments similar to regular terminals with quotes and escaping
                         List<string> values = parseCommandLine(argString);