diff --git a/packages/nylas-api/routes/auth.js b/packages/nylas-api/routes/auth.js
index 7bcd56159..c585d3743 100644
--- a/packages/nylas-api/routes/auth.js
+++ b/packages/nylas-api/routes/auth.js
@@ -100,7 +100,7 @@ module.exports = (server) => {
       }
 
       Promise.all(connectionChecks).then(() => {
-        buildAccountWith({
+        return buildAccountWith({
           name,
           email,
           settings: _.pick(settings, [
@@ -121,6 +121,7 @@ module.exports = (server) => {
       })
       .catch((err) => {
         // TODO: Lots more of this
+        console.log(err)
         reply({error: err.toString()});
       })
     },
diff --git a/packages/nylas-api/routes/messages.js b/packages/nylas-api/routes/messages.js
index 219f21349..c9bd6ab85 100644
--- a/packages/nylas-api/routes/messages.js
+++ b/packages/nylas-api/routes/messages.js
@@ -64,9 +64,13 @@ module.exports = (server) => {
 
         if (accept === 'message/rfc822') {
           query.then((message) => {
+            // TODO message not found
             message.fetchRaw({account, db})
-            .then((raw) => reply(raw))
-            .catch((error) => console.log(error))
+            .then((rawMessage) => reply(rawMessage))
+            .catch((error) => {
+              console.log('Error fetching raw message: ', error)
+              reply(error)
+            })
           })
         } else {
           query.then((message) => {