diff --git a/frontend/src/graph/ui/Chart.vue b/frontend/src/graph/ui/Chart.vue
index 90201769023f07957fb9e590e1422f20e3dccaff..11e22e1e66cd9b7420a87d28cc2f581aaa91bdad 100644
--- a/frontend/src/graph/ui/Chart.vue
+++ b/frontend/src/graph/ui/Chart.vue
@@ -14,6 +14,8 @@ import {getPluginGraphsGraph} from '../../service';
 // for d3 drawing
 import * as d3 from 'd3';
 
+import has from 'lodash/has';
+
 export default {
   props: {
     'doDownload': {
@@ -63,6 +65,10 @@ export default {
   mounted() {
     let chartScope = this;
     getPluginGraphsGraph().then(({errno, data}) => {
+      if (has(data, 'data') === false) {
+        return;
+      }
+
       let graphData = data.data;
 
       // d3 svg drawing
@@ -73,7 +79,7 @@ export default {
       });
 
       // eslint-disable-next-line
-                let render = new dagreD3.render();
+      let render = new dagreD3.render();
       let nodeKeys = [];
 
       let buildInputNodeLabel = function(inputNode) {
@@ -85,6 +91,9 @@ export default {
       };
 
       // add input nodes
+      if (has(graphData, 'input') === false) {
+        return;
+      }
       for (let i=0; i<graphData['input'].length; ++i) {
         let curInputNode = graphData['input'][i];
         let nodeKey = curInputNode['name'];
@@ -105,6 +114,9 @@ export default {
       }
 
       // add operator nodes then add edges from inputs to operator and from operator to output
+      if (has(graphData, 'node') === false) {
+        return;
+      }
       for (let i=0; i<graphData['node'].length; ++i) {
         let curOperatorNode = graphData['node'][i];
         let nodeKey = 'opNode_' + i;
@@ -129,6 +141,9 @@ export default {
         nodeKeys.push(nodeKey);
 
         // add output node
+        if (has(graphData, 'output') === false) {
+          return;
+        }
         let outputNodeKey = curOperatorNode['output'][0];
         let outputPadding = ' '.repeat(Math.floor(outputNodeKey.length/2));
         g.setNode(
@@ -155,7 +170,7 @@ export default {
         }
 
         g.setEdge(nodeKey, curOperatorNode['output'][0], {
-            style: 'stroke: #333;stroke-width: 1.5px'
+          style: 'stroke: #333;stroke-width: 1.5px',
         });
       }
 
diff --git a/frontend/tool/build.js b/frontend/tool/build.js
index 3cfaf7cc1b5a81a1cafc8b3c828540eafe3942a9..2b921ea10c0915103b1b4c8e4b6f9c9dda49dba8 100644
--- a/frontend/tool/build.js
+++ b/frontend/tool/build.js
@@ -24,13 +24,22 @@ webpackConfig.plugins = webpackConfig.plugins.concat([
 
             var name = opt.outputName.replace(/\.html$/, '');
 
-            var feRoot = feRoots[name];
+            /*
+             We do not need the following hack, which was added here:
 
-            if (feRoot) {
-                html = html
-                    .replace(/href="/g, 'href="' + feRoot)
-                    .replace(/src="/g, 'src="' + feRoot);
-            }
+             https://github.com/PaddlePaddle/VisualDL/commit/75f5c3b55fb411e0329b98d66253e60137f88bd5#diff-b6dc766994d45268924eff9a07f0765bR31
+
+             What it does is simply add './' in front of 'src' and 'href' to make sure it is loading local files.
+             But it should be able to load both local JS files and CDN files via 'https://...'
+             */
+
+            // var feRoot = feRoots[name];
+
+            // if (feRoot) {
+            //     html = html
+            //         .replace(/href="/g, 'href="' + feRoot);
+            //         .replace(/src="/g, 'src="' + feRoot);
+            // }
 
             return html;