diff --git a/example/src/main/java/io/netty/example/http2/server/HelloWorldHttp2Handler.java b/example/src/main/java/io/netty/example/http2/server/HelloWorldHttp2Handler.java
index abacae1..b4e9bab 100644
--- a/example/src/main/java/io/netty/example/http2/server/HelloWorldHttp2Handler.java
+++ b/example/src/main/java/io/netty/example/http2/server/HelloWorldHttp2Handler.java
@@ -84,7 +84,7 @@ public class HelloWorldHttp2Handler extends Http2ConnectionHandler {
 
     private static class SimpleHttp2FrameListener extends Http2FrameAdapter {
         private Http2FrameWriter frameWriter;
-
+private boolean noop = true;
         public SimpleHttp2FrameListener(Http2FrameWriter frameWriter) {
             this.frameWriter = frameWriter;
         }
@@ -96,7 +96,8 @@ public class HelloWorldHttp2Handler extends Http2ConnectionHandler {
         public void onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding,
                 boolean endOfStream) throws Http2Exception {
             if (endOfStream) {
-                sendResponse(ctx, streamId, data.retain());
+                sendResponse(ctx, streamId, noop ? null : data.retain());
+                noop = false;
             }
         }
 
@@ -117,9 +118,13 @@ public class HelloWorldHttp2Handler extends Http2ConnectionHandler {
          */
         private void sendResponse(ChannelHandlerContext ctx, int streamId, ByteBuf payload) {
             // Send a frame for the response status
-            Http2Headers headers = new DefaultHttp2Headers().status(new AsciiString("200"));
-            frameWriter.writeHeaders(ctx, streamId, headers, 0, false, ctx.newPromise());
-            frameWriter.writeData(ctx, streamId, payload, 0, true, ctx.newPromise());
+            Http2Headers headers = new DefaultHttp2Headers().add(new AsciiString("foo"), new AsciiString("goo"));//.status(new AsciiString("200"));
+            if (payload == null || !payload.isReadable()) {
+                frameWriter.writeHeaders(ctx, streamId, headers, 0, true, ctx.newPromise());
+            } else {
+                frameWriter.writeHeaders(ctx, streamId, headers, 0, false, ctx.newPromise());
+                frameWriter.writeData(ctx, streamId, payload, 0, true, ctx.newPromise());
+            }
             ctx.flush();
         }
     };