From 868b9b99862d76e81942c7b55a56de8b21d4038c Mon Sep 17 00:00:00 2001
From: Timothy Sullivan <tsullivan@elastic.co>
Date: Fri, 13 Mar 2020 13:34:48 -0700
Subject: [PATCH] fix bogus rison error

---
 .../reporting/server/routes/generate_from_jobparams.ts   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
index 49868bb7ad5d..56622617586f 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
@@ -82,16 +82,21 @@ export function registerGenerateFromJobParams(
       }
 
       const { exportType } = request.params;
+      let jobParams;
       let response;
       try {
-        const jobParams = rison.decode(jobParamsRison) as object | null;
+        jobParams = rison.decode(jobParamsRison) as object | null;
         if (!jobParams) {
           throw new Error('missing jobParams!');
         }
-        response = await handler(exportType, jobParams, legacyRequest, h);
       } catch (err) {
         throw boom.badRequest(`invalid rison: ${jobParamsRison}`);
       }
+      try {
+        response = await handler(exportType, jobParams, legacyRequest, h);
+      } catch (err) {
+        throw handleError(exportType, err);
+      }
       return response;
     },
   });