chartjs
diff --git a/‎src/helpers/helpers.canvas.ts
Copy file name to clipboardExpand all lines: src/helpers/helpers.canvas.ts
+5-1Lines changed: 5 additions & 1 deletion b/‎src/helpers/helpers.canvas.ts
Copy file name to clipboardExpand all lines: src/helpers/helpers.canvas.ts
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎test/specs/helpers.canvas.tests.js
Copy file name to clipboardExpand all lines: test/specs/helpers.canvas.tests.js
+15Lines changed: 15 additions & 0 deletions b/‎test/specs/helpers.canvas.tests.js
Copy file name to clipboardExpand all lines: test/specs/helpers.canvas.tests.js
+15Lines changed: 15 additions & 0 deletions
@@ -131,7 +131,11 @@ export function _alignPixel(chart: Chart, pixel: number, width: number) {
 /**
  * Clears the entire canvas.
  */
-export function clearCanvas(canvas: HTMLCanvasElement, ctx?: CanvasRenderingContext2D) {
+export function clearCanvas(canvas?: HTMLCanvasElement, ctx?: CanvasRenderingContext2D) {
+  if (!ctx && !canvas) {
+    return;
+  }
+
   ctx = ctx || canvas.getContext('2d');
 
   ctx.save();
 
@@ -21,6 +21,21 @@ describe('Chart.helpers.canvas', function() {
       expect(chart.ctx.clearRect.calls.first().object).toBe(chart.ctx);
       expect(chart.ctx.clearRect.calls.first().args).toEqual([0, 0, 150, 245]);
     });
+
+    it('should not throw error when chart is null', function() {
+      function createAndClearChart() {
+        var chart = acquireChart({}, {
+          canvas: null
+        });
+        // explicitly set canvas and ctx to null since setting it in acquireChart doesn't do anything
+        chart.canvas = null;
+        chart.ctx = null;
+
+        helpers.clearCanvas(chart.canvas, chart.ctx);
+      }
+
+      expect(createAndClearChart).not.toThrow();
+    });
   });
 
   describe('isPointInArea', function() {