diff --git a/package.json b/package.json
index 5900c2647259b3a967c70be0d7bdcfdc87a747c5..5165371fe8be17b4459ea3c4938fc2d587a337dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "looking-glass",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
diff --git a/src/app/interfaces/components/results/results.component.ts b/src/app/interfaces/components/results/results.component.ts
index d681284da02edb1c47e47b7d48573d4922b7d667..5b9e5a9051c277e18c6414c7dd0f2642d18d3ebf 100644
--- a/src/app/interfaces/components/results/results.component.ts
+++ b/src/app/interfaces/components/results/results.component.ts
@@ -61,7 +61,7 @@ export class ResultsComponent implements OnInit {
           var results = context.queryResults$;
           results.filter(r => r.getHost() == result.getHost()).forEach(
             r => {
-              r.output = result.getOutput();
+              r.output = result.getOutput() !== null && result.getOutput() !== '' ? result.getOutput() : "Router returned empty response";
               r.duration = result.getDuration();
             }
           );