diff --git a/src/core.js b/src/core.js
index 1962dc19..b2a50b4a 100644
--- a/src/core.js
+++ b/src/core.js
@@ -346,8 +346,11 @@ class Comb {
     let filename = options && options.filename || '';
     let context = options && options.context;
     let tree;
+    const lint = this.lint;
 
-    if (!text) return this.lint ? [] : text;
+    if (!text) return new Promise(function(resolve) {
+      resolve(lint ? [] : text);
+    });
 
     if (!syntax) syntax = 'css';
     this.syntax = syntax;
diff --git a/test/core/scss/empty.scss b/test/core/scss/empty.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/test/core/scss/test.js b/test/core/scss/test.js
index 66782d7f..06c50d67 100644
--- a/test/core/scss/test.js
+++ b/test/core/scss/test.js
@@ -169,6 +169,13 @@ describe('scss', function() {
         return test.shouldBeEqual('content.scss');
     });
 
+    it('Should parse an empty file', function() {
+      let test = new Test(this);
+      test.comb.configure({});
+
+      return test.shouldBeEqual('empty.scss');
+    });
+
     it('Should parse functions', function() {
         let test = new Test(this);
         test.comb.configure({});