diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts
index c24e1f64c43..23a0a0c19ea 100644
--- a/public/app/core/time_series2.ts
+++ b/public/app/core/time_series2.ts
@@ -1,5 +1,4 @@
 import kbn from 'app/core/utils/kbn';
-import { appEvents } from 'app/core/core';
 import { getFlotTickDecimals } from 'app/core/utils/ticks';
 import _ from 'lodash';
 import { getValueFormat } from '@grafana/ui';
@@ -10,12 +9,8 @@ function matchSeriesOverride(aliasOrRegex, seriesAlias) {
   }
 
   if (aliasOrRegex[0] === '/') {
-    try {
-      const regex = kbn.stringToJsRegex(aliasOrRegex);
-      return seriesAlias.match(regex) != null;
-    } catch (e) {
-      return appEvents.emit('alert-error', ['Invalid aliasOrRegex value.', e.message]);
-    }
+    const regex = kbn.stringToJsRegex(aliasOrRegex);
+    return seriesAlias.match(regex) != null;
   }
 
   return aliasOrRegex === seriesAlias;
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 3919c4f69a9..e3e3c4eb588 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -235,7 +235,11 @@ class GraphCtrl extends MetricsPanelCtrl {
     }
 
     for (const series of this.seriesList) {
-      series.applySeriesOverrides(this.panel.seriesOverrides);
+      try {
+        series.applySeriesOverrides(this.panel.seriesOverrides);
+      } catch (e) {
+        this.publishAppEvent('alert-error', [e.message]);
+      }
 
       if (series.unit) {
         this.panel.yaxes[series.yaxis - 1].format = series.unit;