diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java
index 45ab9455..7acf88af 100644
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java
@@ -31,7 +31,7 @@ package com.twelvemonkeys.io.enc;
 import java.io.IOException;
 
 /**
- * Thrown by {@code Decoder}s when encoded data can not be decocded.
+ * Thrown by {@code Decoder}s when encoded data can not be decoded.
  * <p/>
  *
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java
index 44752512..45219c91 100755
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java
@@ -47,13 +47,13 @@ import java.io.IOException;
 public interface Decoder {
     
     /**
-     * Decodes up to {@code pBuffer.length} bytes from the given inputstream,
+     * Decodes up to {@code pBuffer.length} bytes from the given input stream,
      * into the given buffer.
      *
-     * @param pStream the inputstream to decode data from
+     * @param pStream the input stream to decode data from
      * @param pBuffer buffer to store the read data
      *
-     * @return the total number of bytes read into the buffer, or {@code -1}
+     * @return the total number of bytes read into the buffer, or {@code 0}
      * if there is no more data because the end of the stream has been reached.
      *
      * @throws DecodeException if encoded data is corrupt
diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
index 3c4d8820..318ccb86 100644
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
@@ -143,7 +143,7 @@ public final class DecoderStream extends FilterInputStream {
             // Update offset (rest)
             off += dstLen;
 
-            // Inrease count
+            // Increase count
             count += dstLen;
         }
 
diff --git a/common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java
index 86cabe31..70dcfa04 100644
--- a/common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java
+++ b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java
@@ -77,6 +77,10 @@ public abstract class DecoderAbstractTestCase extends ObjectAbstractTestCase {
 
     @Test
     public final void testStreams() throws Exception {
+        if (createCompatibleEncoder() == null) {
+            return;
+        }
+
         for (int i = 1; i < 100; i++) {
             try {
                 runStreamTest(i);