diff --git a/packages/api/src/controllers/cloud.js b/packages/api/src/controllers/cloud.js
index e11f416c8..9acbc18c8 100644
--- a/packages/api/src/controllers/cloud.js
+++ b/packages/api/src/controllers/cloud.js
@@ -56,20 +56,16 @@ module.exports = {
 
   putContent_meta: true,
   async putContent({ folid, cntid, content, name, type }) {
-    putCloudContent(folid, cntid, content, name, type);
+    const resp = await putCloudContent(folid, cntid, content, name, type);
     socket.emitChanged('cloud-content-changed');
-    return {
-      status: 'ok',
-    };
+    return resp;
   },
 
   createFolder_meta: true,
   async createFolder({ name }) {
-    await callCloudApiPost(`folders/create`, { name });
+    const resp = await callCloudApiPost(`folders/create`, { name });
     socket.emitChanged('cloud-content-changed');
-    return {
-      status: 'ok',
-    };
+    return resp;
   },
 
   grantFolder_meta: true,
@@ -78,29 +74,23 @@ module.exports = {
     const invite = m[1];
     const mode = m[2];
 
-    await callCloudApiPost(`folders/grant/${mode}`, { invite });
+    const resp = await callCloudApiPost(`folders/grant/${mode}`, { invite });
     socket.emitChanged('cloud-content-changed');
-    return {
-      status: 'ok',
-    };
+    return resp;
   },
 
   renameFolder_meta: true,
   async renameFolder({ folid, name }) {
-    await callCloudApiPost(`folders/rename`, { folid, name });
+    const resp = await callCloudApiPost(`folders/rename`, { folid, name });
     socket.emitChanged('cloud-content-changed');
-    return {
-      status: 'ok',
-    };
+    return resp;
   },
 
   deleteFolder_meta: true,
   async deleteFolder({ folid }) {
-    await callCloudApiPost(`folders/delete`, { folid });
+    const resp = await callCloudApiPost(`folders/delete`, { folid });
     socket.emitChanged('cloud-content-changed');
-    return {
-      status: 'ok',
-    };
+    return resp;
   },
 
   refreshContent_meta: true,
@@ -117,15 +107,13 @@ module.exports = {
     const folderEncryptor = getCloudFolderEncryptor(folid);
     const recryptedConn = recryptConnection(conn, getInternalEncryptor(), folderEncryptor);
     const connToSend = _.omit(recryptedConn, ['_id']);
-    await this.putContent({
+    const resp = await putCloudContent(
       folid,
-      cntid: undefined,
-      content: JSON.stringify(connToSend),
-      name: getConnectionLabel(conn),
-      type: 'connection',
-    });
-    return {
-      status: 'ok',
-    };
+      undefined,
+      JSON.stringify(connToSend),
+      getConnectionLabel(conn),
+      'connection'
+    );
+    return resp;
   },
 };
diff --git a/packages/api/src/utility/cloudIntf.js b/packages/api/src/utility/cloudIntf.js
index 7b36307bc..bf7fd12f1 100644
--- a/packages/api/src/utility/cloudIntf.js
+++ b/packages/api/src/utility/cloudIntf.js
@@ -237,7 +237,12 @@ async function callCloudApiGet(endpoint, signinHolder = null, additionalHeaders
       ...signinHeaders,
       ...additionalHeaders,
     },
+    validateStatus: status => status < 500,
   });
+  const { errorMessage } = resp.data;
+  if (errorMessage) {
+    return { apiErrorMessage: errorMessage };
+  }
   return resp.data;
 }
 
@@ -255,7 +260,12 @@ async function callCloudApiPost(endpoint, body, signinHolder = null) {
       ...getLicenseHttpHeaders(),
       ...signinHeaders,
     },
+    validateStatus: status => status < 500,
   });
+  const { errorMessage } = resp.data;
+  if (errorMessage) {
+    return { apiErrorMessage: errorMessage };
+  }
   return resp.data;
 }
 
@@ -275,10 +285,14 @@ async function getCloudContent(folid, cntid) {
 
   const encryptor = simpleEncryptor.createEncryptor(signinHolder.encryptionKey);
 
-  const { content, name, type } = await callCloudApiGet(`content/${folid}/${cntid}`, signinHolder, {
+  const { content, name, type, apiErrorMessage } = await callCloudApiGet(`content/${folid}/${cntid}`, signinHolder, {
     'x-kehid': signinHolder.kehid,
   });
 
+  if (apiErrorMessage) {
+    return { apiErrorMessage };
+  }
+
   return {
     content: encryptor.decrypt(content),
     name,
@@ -294,7 +308,7 @@ async function putCloudContent(folid, cntid, content, name, type) {
 
   const encryptor = simpleEncryptor.createEncryptor(signinHolder.encryptionKey);
 
-  await callCloudApiPost(
+  const resp = await callCloudApiPost(
     `put-content`,
     {
       folid,
@@ -307,6 +321,7 @@ async function putCloudContent(folid, cntid, content, name, type) {
     signinHolder
   );
   socket.emitChanged('cloud-content-changed');
+  return resp;
 }
 
 const cloudConnectionCache = {};