diff --git a/src/common/storage/storageclasses/editorstorage.js b/src/common/storage/storageclasses/editorstorage.js
index <HASH>..<HASH> 100644
--- a/src/common/storage/storageclasses/editorstorage.js
+++ b/src/common/storage/storageclasses/editorstorage.js
@@ -377,7 +377,7 @@ define([
             commitData = branch.getFirstCommit(false);
             webSocket.makeCommit(commitData, function (err, result) {
                 if (err) {
-                    throw new Error(err);
+                    logger.error('makeCommit failed', err);
                 }
 
                 // This is for when e.g. a plugin makes a commit to the same branch as the
diff --git a/test-karma/client/js/branchstatus.spec.js b/test-karma/client/js/branchstatus.spec.js
index <HASH>..<HASH> 100644
--- a/test-karma/client/js/branchstatus.spec.js
+++ b/test-karma/client/js/branchstatus.spec.js
@@ -66,7 +66,11 @@ describe('branch status', function () {
     });
 
     afterEach(function (done) {
-        client.deleteBranch(projectName, currentBranchName, currentBranchHash, done);
+        client.selectBranch('master', null, function (err) {
+            client.deleteBranch(projectName, currentBranchName, currentBranchHash, function (err2) {
+                done(err || err2);
+            });
+        });
     });
 
     function createSelectBranch (branchName, callback) {
Switch back to master branch after tests.


Former-commit-id: dae<I>aadc5a7d<I>ea<I>eb<I>a<I>c<I>b3