diff --git a/lib/upload.js b/lib/upload.js
index b5b585cccd5..0ea35bad085 100644
--- a/lib/upload.js
+++ b/lib/upload.js
@@ -38,7 +38,11 @@ module.exports = {
 
     reader.addIgnoreRules(ignoreRules);
 
-    reader.pipe(tar.Pack())
+    reader.on('error', function(err) {
+      console.log(chalk.red('READ ERROR') + ' - Could not read directory. Remove' +
+                          ' symbolic links / shortcuts and try again.');
+      process.exit(1);
+    }).pipe(tar.Pack())
       .pipe(zlib.createGzip())
       .pipe(writeStream);
 
diff --git a/package.json b/package.json
index 38a8479ac22..d56f532bd7b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "firebase-tools",
   "preferGlobal": true,
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "The Firebase Command Line Tools",
   "keywords": [
     "firebase"