const s3 = require('./s3');
const config = require('./config');
const mailParser = require('mailparser').simpleParser;

const build = (emailBodyLocation) => {
  const bucket = config.s3EmailBucket;
  const emailS3Key = emailBodyLocation && emailBodyLocation.key;

  return s3.getObject({ Key: emailS3Key, Bucket: bucket })
    .promise()
    .then(s3Object => mailParser(s3Object.Body))
    .then(mail => mail.html)
    .catch((error) => {
      throw new Error(`Failed to get and parse S3 object ${bucket}/${emailS3Key}: ${error}`);
    });
};

module.exports.build = build;

const s3 = require('./s3');
const config = require('./config');
const mailParser = require('mailparser').simpleParser;

const build = (emailBodyLocation) => {
  const bucket = config.s3EmailBucket;
  const emailS3Key = emailBodyLocation && emailBodyLocation.key;

  return s3.getObject({ Key: emailS3Key, Bucket: bucket })
    .promise()
    .then(s3Object => mailParser(s3Object.Body))
    .then(mail => mail.html)
    .catch(() => {
      throw new Error(`Email body with ${JSON.stringify(emailBodyLocation)} not found`);
    });
};

module.exports.build = build;

--- 
+++ 
@@ -10,8 +10,8 @@
     .promise()
     .then(s3Object => mailParser(s3Object.Body))
     .then(mail => mail.html)
-    .catch((error) => {
-      throw new Error(`Failed to get and parse S3 object ${bucket}/${emailS3Key}: ${error}`);
+    .catch(() => {
+      throw new Error(`Email body with ${JSON.stringify(emailBodyLocation)} not found`);
     });
 };
 
Add more info to error logging when talking to S3
