diff --git a/codec/src/main/java/io/netty/handler/codec/xml/XmlFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/xml/XmlFrameDecoder.java
index c4f7097435..4a8b262bf8 100644
--- a/codec/src/main/java/io/netty/handler/codec/xml/XmlFrameDecoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/xml/XmlFrameDecoder.java
@@ -111,8 +111,16 @@ public class XmlFrameDecoder extends ByteToMessageDecoder {
                 if (i < bufferLength - 1) {
                     final byte peekAheadByte = in.getByte(i + 1);
                     if (peekAheadByte == '/') {
-                        // found </, decrementing openBracketsCount
-                        openBracketsCount--;
+                        // found </, we must check if it is enclosed
+                        int peekFurtherAheadIndex = i + 2;
+                        while (peekFurtherAheadIndex <= bufferLength - 1) {
+                            //if we have </ and enclosing > we can decrement openBracketsCount
+                            if (in.getByte(peekFurtherAheadIndex) == '>') {
+                                openBracketsCount--;
+                                break;
+                            }
+                            peekFurtherAheadIndex++;
+                        }
                     } else if (isValidStartCharForXmlElement(peekAheadByte)) {
                         atLeastOneXmlElementFound = true;
                         // char after < is a valid xml element start char,
@@ -166,14 +174,15 @@ public class XmlFrameDecoder extends ByteToMessageDecoder {
         }
 
         final int readerIndex = in.readerIndex();
+        int xmlElementLength = length - readerIndex;
 
-        if (openBracketsCount == 0 && length > 0) {
-            if (length >= bufferLength) {
-                length = in.readableBytes();
+        if (openBracketsCount == 0 && xmlElementLength > 0) {
+            if (readerIndex + xmlElementLength >= bufferLength) {
+                xmlElementLength = in.readableBytes();
             }
             final ByteBuf frame =
-                    extractFrame(in, readerIndex + leadingWhiteSpaceCount, length - leadingWhiteSpaceCount);
-            in.skipBytes(length);
+                    extractFrame(in, readerIndex + leadingWhiteSpaceCount, xmlElementLength - leadingWhiteSpaceCount);
+            in.skipBytes(xmlElementLength);
             out.add(frame);
         }
     }
diff --git a/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java
index 62f6719fd7..db3660accf 100644
--- a/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/xml/XmlFrameDecoderTest.java
@@ -101,6 +101,12 @@ public class XmlFrameDecoderTest {
         testDecodeWithXml("  \n\r \t<xxx/>\ttrash", "<xxx/>", CorruptedFrameException.class);
     }
 
+    @Test
+    public void testDecodeInvalidXml() {
+        testDecodeWithXml("<a></", new Object[0]);
+        testDecodeWithXml("<a></a", new Object[0]);
+    }
+
     @Test
     public void testDecodeWithCDATABlock() {
         final String xml = "<book>" +
@@ -119,18 +125,21 @@ public class XmlFrameDecoderTest {
     }
 
     @Test
-    public void testDecodeWithTwoMessages() {
+    public void testDecodeWithMultipleMessages() {
         final String input = "<root xmlns=\"http://www.acme.com/acme\" status=\"loginok\" " +
                 "timestamp=\"1362410583776\"/>\n\n" +
                 "<root xmlns=\"http://www.acme.com/acme\" status=\"start\" time=\"0\" " +
                 "timestamp=\"1362410584794\">\n<child active=\"1\" status=\"started\" id=\"935449\" " +
-                "msgnr=\"2\"/>\n</root>";
+                "msgnr=\"2\"/>\n</root>" +
+                "<root xmlns=\"http://www.acme.com/acme\" status=\"logout\" timestamp=\"1362410584795\"/>";
         final String frame1 = "<root xmlns=\"http://www.acme.com/acme\" status=\"loginok\" " +
                 "timestamp=\"1362410583776\"/>";
         final String frame2 = "<root xmlns=\"http://www.acme.com/acme\" status=\"start\" time=\"0\" " +
                 "timestamp=\"1362410584794\">\n<child active=\"1\" status=\"started\" id=\"935449\" " +
                 "msgnr=\"2\"/>\n</root>";
-        testDecodeWithXml(input, frame1, frame2);
+        final String frame3 = "<root xmlns=\"http://www.acme.com/acme\" status=\"logout\" " +
+                "timestamp=\"1362410584795\"/>";
+        testDecodeWithXml(input, frame1, frame2, frame3);
     }
 
     @Test