diff --git a/src/services/cli-http-client.js b/src/services/cli-http-client.js
index b02c7728..d8b82bbc 100644
--- a/src/services/cli-http-client.js
+++ b/src/services/cli-http-client.js
@@ -159,7 +159,7 @@ class CliRequestClient {
     const moreInfoMessage = more_info ? `See ${more_info} for more info.` : '';
     const error = {
       message: `Error code ${code || 'N/A'} from Twilio: ${message || 'No message provided'}. ${moreInfoMessage}`,
-      code,
+      code: code.toString().substring(0, 2),
       details,
     };
 
diff --git a/test/services/cli-http-client.test.js b/test/services/cli-http-client.test.js
index 324c6846..cf119b74 100644
--- a/test/services/cli-http-client.test.js
+++ b/test/services/cli-http-client.test.js
@@ -125,5 +125,17 @@ describe('services', () => {
         });
         expect(response.statusCode).to.equal(200);
       });
+
+    test.it('correct exit code', () => {
+      const client = new CliRequestClient('bleh', logger);
+      const response = {
+        code: 20404,
+        message: 'error',
+        moreInfo: '',
+        details: '',
+      };
+      const { message, code } = client.formatErrorMessage(response);
+      expect(code).to.equal('20');
+    });
   });
 });