diff --git a/bin/slave.py b/bin/slave.py
index e2d4cf1..2ebb0db 100644
--- a/bin/slave.py
+++ b/bin/slave.py
@@ -27,8 +27,12 @@ def work(inq, outq, g, myname):
     if i == None:
       shutdown = o
       return shutdown
-    a = g.run_baker(X, order = o, extra_points = e)
-    outq.put((i, myname, a['qlin'], a['error'], a['final'], exact(X)))
+    try:
+      a = g.run_baker(X, order = o, extra_points = e)
+      outq.put((i, myname, a['qlin'], a['error'], a['final'], exact(X)))
+    except Exception as e:
+      print X, e
+      outq.put((i, myname, 0.0, 0.0, 0.0, 0.0))
 
 
 if __name__ == '__main__':
@@ -59,7 +63,7 @@ if __name__ == '__main__':
   g = ggrid(input_file)
   g.q = np.array([exact(x) for x in g.verts])
 
-  myname = options.label
+  myname = "%s-%d" % os.uname()[1], os.getpid())
 
   shutdown = False
   while not shutdown: