diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
index 443f882d95c..e4b83300f67 100644
--- a/src/components/drawing/index.js
+++ b/src/components/drawing/index.js
@@ -198,13 +198,7 @@ drawing.fillGroupStyle = function(s) {
     s.style('stroke-width', 0)
     .each(function(d) {
         var shape = d3.select(this);
-        try {
-            shape.call(Color.fill, d[0].trace.fillcolor);
-        }
-        catch(e) {
-            Lib.error(e, s);
-            shape.remove();
-        }
+        shape.call(Color.fill, d[0].trace.fillcolor);
     });
 };
 
diff --git a/src/traces/scatter/link_traces.js b/src/traces/scatter/link_traces.js
index ed50bd73d00..762d6f4355f 100644
--- a/src/traces/scatter/link_traces.js
+++ b/src/traces/scatter/link_traces.js
@@ -75,12 +75,11 @@ module.exports = function linkTraces(gd, plotinfo, cdscatter) {
                 }
             }
 
-            if(trace.fill && (
-                trace.fill.substr(0, 6) === 'tozero' || trace.fill === 'toself' ||
-                (trace.fill.substr(0, 2) === 'to' && !trace._prevtrace))
-            ) {
-                trace._ownfill = true;
-            }
+            trace._ownfill = (trace.fill && (
+                trace.fill.substr(0, 6) === 'tozero' ||
+                trace.fill === 'toself' ||
+                (trace.fill.substr(0, 2) === 'to' && !trace._prevtrace)
+            ));
 
             prevtraces[group] = trace;
         } else {