diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index 46e787738e5..24911b7f103 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -1,5 +1,3 @@
-///<reference path="../../headers/common.d.ts" />
-
 import _ from 'lodash';
 
 import config from 'app/core/config';
diff --git a/public/app/plugins/datasource/graphite/config_ctrl.ts b/public/app/plugins/datasource/graphite/config_ctrl.ts
index 595584691a2..232599f8988 100644
--- a/public/app/plugins/datasource/graphite/config_ctrl.ts
+++ b/public/app/plugins/datasource/graphite/config_ctrl.ts
@@ -15,6 +15,10 @@ export class GraphiteConfigCtrl {
   }
 
   autoDetectGraphiteVersion() {
+    if (!this.current.id) {
+      return;
+    }
+
     this.datasourceSrv.loadDatasource(this.current.name)
     .then((ds) => {
       return ds.getVersion();