diff --git a/.gitignore b/.gitignore
index 6aae4db0b1..c39f642fe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ shell_g
 /out/
 /test/cctest/cctest.status2
 /test/es5conform/data
-/test/messages/messages.status2
+/test/message/message.status2
 /test/mjsunit/mjsunit.status2
 /test/mozilla/CHECKED_OUT_VERSION
 /test/mozilla/data
diff --git a/tools/testrunner/network/endpoint.py b/tools/testrunner/network/endpoint.py
index 25547c2f15..8350feee59 100644
--- a/tools/testrunner/network/endpoint.py
+++ b/tools/testrunner/network/endpoint.py
@@ -108,7 +108,15 @@ def Execute(workspace, ctx, tests, sock, server):
 
   progress_indicator = EndpointProgress(sock, server, ctx)
   runner = execution.Runner(suites, progress_indicator, ctx)
-  runner.Run(server.jobs)
+  try:
+    runner.Run(server.jobs)
+  except IOError, e:
+    if e.errno == 2:
+      message = ("File not found: %s, maybe you forgot to 'git add' it?" %
+                 e.filename)
+    else:
+      message = "%s" % e
+    compression.Send([-1, message], sock)
   progress_indicator.HasRun(None)  # Sentinel to signal the end.
   progress_indicator.sender_lock.acquire()  # Released when sending is done.
   progress_indicator.sender_lock.release()
diff --git a/tools/testrunner/server/work_handler.py b/tools/testrunner/server/work_handler.py
index 9e61af8227..80f01781eb 100644
--- a/tools/testrunner/server/work_handler.py
+++ b/tools/testrunner/server/work_handler.py
@@ -128,6 +128,7 @@ class WorkHandler(SocketServer.BaseRequestHandler):
     return True
 
   def _ApplyPatch(self, patch):
+    if not patch: return True  # Just skip if the patch is empty.
     patchfilename = "_dtest_incoming_patch.patch"
     with open(patchfilename, "w") as f:
       f.write(patch)