From c34a02cf20f4948fac8a5361c8d6c75bfe49f48e Mon Sep 17 00:00:00 2001
From: Andreas Streichardt <andreas@arangodb.com>
Date: Thu, 28 Jul 2016 12:05:51 +0200
Subject: [PATCH] Improve error handling

---
 js/apps/system/_admin/aardvark/APP/statistics.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/js/apps/system/_admin/aardvark/APP/statistics.js b/js/apps/system/_admin/aardvark/APP/statistics.js
index 859e6aa23c..4d315e3184 100644
--- a/js/apps/system/_admin/aardvark/APP/statistics.js
+++ b/js/apps/system/_admin/aardvark/APP/statistics.js
@@ -499,7 +499,13 @@ router.get("/coordshort", function(req, res) {
   var coordinatorStats = coordinators.map(coordinator => {
     var endpoint = global.ArangoClusterInfo.getServerEndpoint(coordinator);
     var response = download(endpoint.replace(/^tcp/, "http") + "/_db/_system/_admin/aardvark/statistics/short?count=" + coordinators.length);
-    return JSON.parse(response.body);
+
+    try {
+      return JSON.parse(response.body);
+    } catch (e) {
+      console.error("Couldn't read statistics response:", response.body);
+      throw e;
+    }
   });
   
   mergeHistory(coordinatorStats);