From 756d969e76b24de40cad8b4651e6b3a6c2fa0674 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Wed, 13 Aug 2014 09:46:06 -0700
Subject: [PATCH] Fix initial panel state given an error state, fix attempt to
 destroy error state vis. Closes #247

---
 src/kibana/apps/dashboard/directives/grid.js      | 2 +-
 src/kibana/apps/visualize/directives/visualize.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/kibana/apps/dashboard/directives/grid.js b/src/kibana/apps/dashboard/directives/grid.js
index e49abac8d434..7958eac72cf1 100644
--- a/src/kibana/apps/dashboard/directives/grid.js
+++ b/src/kibana/apps/dashboard/directives/grid.js
@@ -82,7 +82,7 @@ define(function (require) {
               makePanelSerializeable(panel);
             });
           });
-
+          safeLayout();
           $window.on('resize', safeLayout);
           $scope.$on('ready:vis', safeLayout);
         };
diff --git a/src/kibana/apps/visualize/directives/visualize.js b/src/kibana/apps/visualize/directives/visualize.js
index 6424252ccdb1..9f4973f75282 100644
--- a/src/kibana/apps/visualize/directives/visualize.js
+++ b/src/kibana/apps/visualize/directives/visualize.js
@@ -141,7 +141,8 @@ define(function (require) {
         });
 
         $scope.$on('$destroy', function () {
-          if ($scope.vis) $scope.vis.destroy();
+          // Vis with missing indexpattern will not have destroy
+          if ($scope.vis && $scope.vis.destroy) $scope.vis.destroy();
           if (chart) {
             chart.off('hover');
             chart.off('click');