diff --git a/.travis.yml b/.travis.yml
index edac1d832..bbe55e329 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ node_js:
 before_script:
   - npm install -g mocha
 after_script: 
-  - NODE_ENV=test ./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec --recursive && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
+  - NODE_ENV=test ./node_modules/.bin/istanbul cover --report lcovonly ./node_modules/mocha/bin/_mocha -- -R spec --recursive && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
diff --git a/tags/layout.js b/tags/layout.js
index 3feeefef9..5c7cd9b84 100644
--- a/tags/layout.js
+++ b/tags/layout.js
@@ -29,10 +29,6 @@ module.exports = function(liquid) {
                 .then((partial) => {
                     scope.pop();
                     return partial;
-                })
-                .catch((e) => {
-                    e.file = layout;
-                    throw e;
                 });
         }
     });
diff --git a/test/express.js b/test/express.js
index 970887d77..635d9e041 100644
--- a/test/express.js
+++ b/test/express.js
@@ -36,6 +36,9 @@ describe('engine#express()', function() {
             });
         });
     });
+    after(function(){
+        mock.restore();
+    });
     it('should render templates', function(done) {
         request(app).get('/name')
             .expect('My name is harttle.')
diff --git a/test/util/error.js b/test/util/error.js
index a1a9f966b..5d1e5374e 100644
--- a/test/util/error.js
+++ b/test/util/error.js
@@ -40,6 +40,7 @@ describe('error', function() {
             expect(err.input).to.equal('{% raw %}');
             expect(err.line).to.equal(4);
             expect(err.file).to.equal('/foo.html');
+            mock.restore();
         });
     });