diff --git a/BuildServer/app.js b/BuildServer/app.js
index 77b8014..b6af9d5 100644
--- a/BuildServer/app.js
+++ b/BuildServer/app.js
@@ -4,7 +4,9 @@
  */
 
 var https = require('https');
-var fs = require('fs');
+var realFs = require('fs');
+var fs = require('graceful-fs');
+fs.gracefulify(realFs);
 
 var express = require('express');
 var routes = require('./routes');
diff --git a/BuildServer/package.json b/BuildServer/package.json
index f3dbe90..838035f 100644
--- a/BuildServer/package.json
+++ b/BuildServer/package.json
@@ -12,6 +12,7 @@
     "fs-extra": "~0.12.0",
     "github": "~0.2.4",
     "glob": "~3.2.7",
+    "graceful-fs": "^4.1.2",
     "jade": "*",
     "mustache": "~0.8.1",
     "nodegit": "~0.1.4",