diff --git a/Makefile b/Makefile
index 2b12e18..215ba60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 all:
 	node make
 
+favicon:
+	node gh-badge.js '' '' '#bada55' .png > web/favicon.png
+
 deploy:
 	git add Verdana.ttf
 	git commit -m'MUST NOT BE ON GITHUB'
diff --git a/svg-to-img.js b/svg-to-img.js
index 83f493e..eac8d52 100644
--- a/svg-to-img.js
+++ b/svg-to-img.js
@@ -35,7 +35,7 @@ module.exports = function (svg, format, out, cb) {
     });
     // Remove the temporary file after use.
     inStream.on('end', function() {
-      out.end();
+      try { out.end(); } catch(e) {}
       addToCache(cacheIndex, cached);
       fs.unlink(tmpFile, cb);
     });
diff --git a/web/favicon.png b/web/favicon.png
new file mode 100644
index 0000000..1c3c32f
Binary files /dev/null and b/web/favicon.png differ
diff --git a/web/index.html b/web/index.html
index 8eb90ba..905b18d 100644
--- a/web/index.html
+++ b/web/index.html
@@ -2,6 +2,7 @@
 <meta charset=utf-8>
 <title> Badge Service </title>
 <meta name='viewport' content='width=device-width,initial-scale=1'>
+<link rel='icon' type='image/png' href='favicon.png'>
 <link href='//fonts.googleapis.com/css?family=Vollkorn' rel='stylesheet'>
 <style>
 :root { text-align: center; font-family: Linux Libertine O, Vollkorn, serif; }