diff --git a/.gitignore b/.gitignore
index 6a066b92f..9fbcff2ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ bower.json
 *.log
 *.swp
 *.stackdump
+
+chart.js-*.tgz
diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 33c94799e..20d4cfaba 100644
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -454,7 +454,7 @@ module.exports = function() {
 	 * @private
  	 */
 	helpers._calculatePadding = function(container, padding, parentDimension) {
-		padding = helpers.getStyle(container, padding);
+		padding = helpers.getStyle(container, padding) || '0';
 
 		return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
 	};