diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index 6b170617c..3dd269ea0 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/pom.xml
@@ -43,13 +43,6 @@
             <version>1.6.1</version>
         </dependency>
         
-        <!-- Apache Commons -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.0.1</version>
-        </dependency>
-        
     </dependencies>
 
 </project>
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java
index d7ccf9bdf..cb35a4ac2 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java
@@ -44,7 +44,6 @@ import net.sourceforge.guacamole.GuacamoleException;
 import net.sourceforge.guacamole.GuacamoleServerException;
 import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
 import net.sourceforge.guacamole.protocol.GuacamoleInstruction.Operation;
-import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * A GuacamoleReader which wraps a standard Java Reader, using that Reader as
@@ -202,8 +201,19 @@ public class ReaderGuacamoleReader implements GuacamoleReader {
         LinkedList<String> elements = new LinkedList<String>();
         while (elementStart < instructionBuffer.length) {
 
-            // Find end of length 
-            int lengthEnd = ArrayUtils.indexOf(instructionBuffer, '.', elementStart);
+            // Find end of length
+            int lengthEnd = -1;
+            for (int i=elementStart; i<instructionBuffer.length; i++) {
+                if (instructionBuffer[i] == '.') {
+                    lengthEnd = i;
+                    break;
+                }
+            }
+
+            // read() is required to return a complete instruction. If it does
+            // not, this is a severe internal error.
+            if (lengthEnd == -1)
+                throw new GuacamoleServerException("Read returned incomplete instruction.");
 
             // Parse length
             int length = Integer.parseInt(new String(