diff --git a/tests/vnc_playback.html b/tests/vnc_playback.html
index 4c579415..06de8377 100644
--- a/tests/vnc_playback.html
+++ b/tests/vnc_playback.html
@@ -140,7 +140,11 @@
 
             //message("Processing frame: " + frame_idx);
             if (frame) {
-                rfb.recv_message({'data' : frame.slice(frame.indexOf('{', 1)+1)});
+                if (frame === 'EOF') {
+                    //message("Found EOF");
+                } else {
+                    rfb.recv_message({'data' : frame.slice(frame.indexOf('{', 1)+1)});
+                }
                 frame_idx++;
             }
 
diff --git a/utils/wsproxy.py b/utils/wsproxy.py
index cf4c94a5..c2a7e990 100755
--- a/utils/wsproxy.py
+++ b/utils/wsproxy.py
@@ -105,7 +105,8 @@ def proxy_handler(client):
 
     if settings['record']:
         print "Opening record file: %s" % settings['record']
-        rec = open(settings['record'], 'a')
+        rec = open(settings['record'], 'w+')
+        rec.write("var VNC_frame_data = [\n")
 
     print "Connecting to: %s:%s" % (target_host, target_port)
     tsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -117,7 +118,9 @@ def proxy_handler(client):
         do_proxy(client, tsock)
     except:
         if tsock: tsock.close()
-        if rec: rec.close()
+        if rec:
+            rec.write("'EOF']\n")
+            rec.close()
         raise
 
 if __name__ == '__main__':