diff --git a/CliClient/tests/synchronizer.js b/CliClient/tests/synchronizer.js
index 3d06fbf32..1ffba3e74 100644
--- a/CliClient/tests/synchronizer.js
+++ b/CliClient/tests/synchronizer.js
@@ -848,7 +848,7 @@ describe('Synchronizer', function() {
 	}));
 
 	it('should sync resources', asyncTest(async () => {
-		while (insideBeforeEach) await time.msleep(100);
+		while (insideBeforeEach) await time.msleep(500);
 
 		let folder1 = await Folder.save({ title: "folder1" });
 		let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
diff --git a/ReactNativeClient/lib/WebDavApi.js b/ReactNativeClient/lib/WebDavApi.js
index d8f53cb07..d007141b1 100644
--- a/ReactNativeClient/lib/WebDavApi.js
+++ b/ReactNativeClient/lib/WebDavApi.js
@@ -192,7 +192,7 @@ class WebDavApi {
 
 			const json = await loadResponseJson();
 
-			if (json['d:error']) {
+			if (json && json['d:error']) {
 				const code = json['d:error']['s:exception'] ? json['d:error']['s:exception'].join(' ') : response.status;
 				const message = json['d:error']['s:message'] ? json['d:error']['s:message'].join("\n") : shortResponseText();
 				throw new JoplinError(method + ' ' + path + ': ' + message + ' (' + code + ')', response.status);