diff --git a/public/app/features/panel/panel_directive.js b/public/app/features/panel/panel_directive.js
index f0c344cfad0..b1a363b53f7 100644
--- a/public/app/features/panel/panel_directive.js
+++ b/public/app/features/panel/panel_directive.js
@@ -19,6 +19,8 @@ function (angular, $, config) {
           var panelEl = angular.element(document.createElement('grafana-panel-' + panelType));
           elem.append(panelEl);
           $compile(panelEl)(scope);
+        }).catch(function(err) {
+          scope.appEvent('alert-error', ['Panel Load Error', 'Failed to load panel ' + panelType + ', ' + err]);
         });
       }
     };
diff --git a/public/app/features/panel/panel_meta.js b/public/app/features/panel/panel_meta.js
new file mode 100644
index 00000000000..c110d948e08
--- /dev/null
+++ b/public/app/features/panel/panel_meta.js
@@ -0,0 +1,7 @@
+define([
+  './panel_meta2',
+],
+function (panelMeta) {
+  'use strict';
+  return panelMeta.default;
+});
diff --git a/public/app/features/panel/panel_meta.ts b/public/app/features/panel/panel_meta2.ts
similarity index 97%
rename from public/app/features/panel/panel_meta.ts
rename to public/app/features/panel/panel_meta2.ts
index c4fe2373799..ca276f9377b 100644
--- a/public/app/features/panel/panel_meta.ts
+++ b/public/app/features/panel/panel_meta2.ts
@@ -7,7 +7,7 @@ export default class PanelMeta {
   editorTabs: any;
   extendedMenu: any;
 
-  constructor(options : any) {
+  constructor(options: any) {
     this.description = options.description;
     this.fullscreen = options.fullscreen;
     this.editIcon = options.editIcon;
diff --git a/public/app/plugins/panels/dashlist/module.js b/public/app/plugins/panels/dashlist/module.js
index fddc762ffe2..ec816811574 100644
--- a/public/app/plugins/panels/dashlist/module.js
+++ b/public/app/plugins/panels/dashlist/module.js
@@ -9,7 +9,7 @@ function (angular, app, _, config, PanelMeta) {
   'use strict';
 
   var module = angular.module('grafana.panels.dashlist', []);
-  app.useModule(module);
+  app.default.useModule(module);
 
   module.directive('grafanaPanelDashlist', function() {
     return {
diff --git a/public/app/plugins/panels/graph/seriesOverridesCtrl.js b/public/app/plugins/panels/graph/seriesOverridesCtrl.js
index fd5c11b2060..66b368fc337 100644
--- a/public/app/plugins/panels/graph/seriesOverridesCtrl.js
+++ b/public/app/plugins/panels/graph/seriesOverridesCtrl.js
@@ -7,7 +7,7 @@ define([
   'use strict';
 
   var module = angular.module('grafana.panels.graph', []);
-  app.useModule(module);
+  app.default.useModule(module);
 
   module.controller('SeriesOverridesCtrl', function($scope, $element, popoverSrv) {
     $scope.overrideMenu = [];
diff --git a/public/app/plugins/panels/singlestat/module.js b/public/app/plugins/panels/singlestat/module.js
index 47b18ba526f..5091dc4f089 100644
--- a/public/app/plugins/panels/singlestat/module.js
+++ b/public/app/plugins/panels/singlestat/module.js
@@ -11,7 +11,7 @@ function (angular, app, _, kbn, TimeSeries, PanelMeta) {
   'use strict';
 
   var module = angular.module('grafana.panels.singlestat');
-  app.useModule(module);
+  app.default.useModule(module);
 
   module.directive('grafanaPanelSinglestat', function() {
     return {
diff --git a/public/app/plugins/panels/singlestat/singleStatPanel.js b/public/app/plugins/panels/singlestat/singleStatPanel.js
index b04f1c57dcd..c71da18a3c0 100644
--- a/public/app/plugins/panels/singlestat/singleStatPanel.js
+++ b/public/app/plugins/panels/singlestat/singleStatPanel.js
@@ -9,7 +9,7 @@ function (angular, app, _, $) {
   'use strict';
 
   var module = angular.module('grafana.panels.singlestat', []);
-  app.useModule(module);
+  app.default.useModule(module);
 
   module.directive('singlestatPanel', function($location, linkSrv, $timeout, templateSrv) {
 
diff --git a/public/app/plugins/panels/table/controller.ts b/public/app/plugins/panels/table/controller.ts
index 11b0cc5e2f4..cdf5d897dcb 100644
--- a/public/app/plugins/panels/table/controller.ts
+++ b/public/app/plugins/panels/table/controller.ts
@@ -3,7 +3,7 @@
 import angular = require('angular');
 import _ = require('lodash');
 import moment = require('moment');
-import PanelMeta from '../../../features/panel/panel_meta';
+import PanelMeta from 'app/features/panel/panel_meta2';
 
 import {transformDataToTable} from './transformers';
 
diff --git a/public/app/plugins/panels/text/module.js b/public/app/plugins/panels/text/module.js
index 145b3be9b0c..f9ec093680a 100644
--- a/public/app/plugins/panels/text/module.js
+++ b/public/app/plugins/panels/text/module.js
@@ -11,7 +11,7 @@ function (angular, app, _, require, PanelMeta) {
   var converter;
 
   var module = angular.module('grafana.panels.text', []);
-  app.useModule(module);
+  app.default.useModule(module);
 
   module.directive('grafanaPanelText', function() {
     return {