diff --git a/src/client/rest/DiscordAPIError.js b/src/client/rest/DiscordAPIError.js
index f0a641285..580723bf2 100644
--- a/src/client/rest/DiscordAPIError.js
+++ b/src/client/rest/DiscordAPIError.js
@@ -5,9 +5,9 @@
 class DiscordAPIError extends Error {
   constructor(path, error) {
     super();
-    const flattened = error.errors ? `\n${this.constructor.flattenErrors(error.errors).join('\n')}` : '';
+    const flattened = this.constructor.flattenErrors(error.errors || error).join('\n');
     this.name = 'DiscordAPIError';
-    this.message = `${error.message}${flattened}`;
+    this.message = error.message && flattened ? `${error.message}\n${flattened}` : error.message || flattened;
 
     /**
      * The path of the request relative to the HTTP endpoint
@@ -33,12 +33,15 @@ class DiscordAPIError extends Error {
     let messages = [];
 
     for (const [k, v] of Object.entries(obj)) {
+      if (k === 'message') continue;
       const newKey = key ? isNaN(k) ? `${key}.${k}` : `${key}[${k}]` : k;
 
       if (v._errors) {
         messages.push(`${newKey}: ${v._errors.map(e => e.message).join(' ')}`);
       } else if (v.code || v.message) {
         messages.push(`${v.code ? `${v.code}: ` : ''}${v.message}`.trim());
+      } else if (typeof v === 'string') {
+        messages.push(v);
       } else {
         messages = messages.concat(this.flattenErrors(v, newKey));
       }