diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LdapCodec.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LdapCodec.java
index d02cc5a..f5ad1b7 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LdapCodec.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LdapCodec.java
@@ -84,11 +84,11 @@ public NextAction handleRead(final FilterChainContext ctx) throws IOException {
                 ctx.setMessage(decodePacket(new ASN1BufferReader(maxASN1ElementSize, buffer.asReadOnlyBuffer())));
                 buffer.tryDispose();
                 return ctx.getInvokeAction(remainder);
-            }
-
-            if (logger.isTraceEnabled()) {
-            	logger.trace(String.format("Disposed buffer hasCode: %d", System.identityHashCode(buffer)));
-            }
+	        } finally {
+	            if (logger.isTraceEnabled()) {
+	            	logger.trace(String.format("Disposed buffer hasCode: %d", System.identityHashCode(buffer)));
+	            }
+	        }
         } catch (Exception e) {
             onLdapCodecError(ctx, e);
             ctx.getConnection().closeSilently();