diff --git a/src/app/directives/grafanaPanel.js b/src/app/directives/grafanaPanel.js
index 0229277b038..db296d4d45a 100644
--- a/src/app/directives/grafanaPanel.js
+++ b/src/app/directives/grafanaPanel.js
@@ -18,8 +18,8 @@ function (angular, $) {
        '<div class="row-fluid panel-extra">' +
           '<div class="panel-extra-container">' +
             '<span class="alert-error panel-error small pointer"' +
-                  'config-modal="app/partials/inspector.html" ng-if="panel.error">' +
-              '<span data-placement="right" bs-tooltip="panel.error">' +
+                  'config-modal="app/partials/inspector.html" ng-if="panelMeta.error">' +
+              '<span data-placement="right" bs-tooltip="panelMeta.error">' +
               '<i class="icon-exclamation-sign"></i><span class="panel-error-arrow"></span>' +
               '</span>' +
             '</span>' +
diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js
index b66da0ebed6..09866d055b6 100644
--- a/src/app/panels/graph/module.js
+++ b/src/app/panels/graph/module.js
@@ -209,7 +209,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries) {
         .then($scope.dataHandler)
         .then(null, function(err) {
           $scope.panelMeta.loading = false;
-          $scope.panel.error = err.message || "Timeseries data request error";
+          $scope.panelMeta.error = err.message || "Timeseries data request error";
           $scope.inspector.error = err;
           $scope.render([]);
         });
diff --git a/src/app/services/panelSrv.js b/src/app/services/panelSrv.js
index 1864db59f02..ef78dbe11ed 100644
--- a/src/app/services/panelSrv.js
+++ b/src/app/services/panelSrv.js
@@ -95,7 +95,7 @@ function (angular, _) {
         $scope.datasource = datasourceSrv.get(datasource);
 
         if (!$scope.datasource) {
-          $scope.panel.error = "Cannot find datasource " + datasource;
+          $scope.panelMeta.error = "Cannot find datasource " + datasource;
           return;
         }
       };
@@ -129,7 +129,7 @@ function (angular, _) {
         $scope.get_data = function() {
           if ($scope.otherPanelInFullscreenMode()) { return; }
 
-          delete $scope.panel.error;
+          delete $scope.panelMeta.error;
           $scope.panelMeta.loading = true;
 
           panel_get_data();
diff --git a/src/app/services/unsavedChangesSrv.js b/src/app/services/unsavedChangesSrv.js
index c10b78b6bf3..d1a83a59da2 100644
--- a/src/app/services/unsavedChangesSrv.js
+++ b/src/app/services/unsavedChangesSrv.js
@@ -81,7 +81,6 @@ function(angular, _, config) {
 
       // ignore timespan changes
       current.time = original.time = {};
-
       current.refresh = original.refresh;
 
       var currentTimepicker = _.findWhere(current.nav, { type: 'timepicker' });