diff --git a/docs.html b/docs.html
index c0d11b8..085b3fb 100644
--- a/docs.html
+++ b/docs.html
@@ -317,6 +317,7 @@ var csv = Papa.unparse({
 	worker: false,
 	comments: false,
 	complete: undefined,
+	error: undefined,
 	download: false,
 	keepEmptyRows: false,
 	chunk: undefined
@@ -349,8 +350,9 @@ var csv = Papa.unparse({
 </code>
 							If streaming, results will <i>not</i> be available in this function.
 						</li>
-						<li><code>download</code> If <code>true</code>, this indicates that the string you passed in is actually a URL from which to download a file and parse it.</li>
-						<li><code>keepEmptyRows</code> If <code>true</code>, rows that are empty will be included in the results as an empty array. This is useful if you want to maintain line (or at least <i>row</i>) parity with the original input.</li>
+						<li><code>error</code> A callback to execute if FileReader encounters an error. The function should receive two arguments: the error and the File.</li>
+						<li><code>download</code> If true, this indicates that the string you passed in is actually a URL from which to download a file and parse it.</li>
+						<li><code>keepEmptyRows</code> If true, rows that are empty will be included in the results as an empty array. This is useful if you want to maintain line (or at least <i>row</i>) parity with the original input.</li>
 						<li><code>chunk</code> A callback, much like step, which activates streaming and is executed after every chunk (piece) is loaded and parsed. Works only with local and remote files. Do not use both chunk and step callbacks together. This function can be used to receive results one chunk at a time rather than one row at a time. If your file has a million rows, this results in, say, 10,000 function invocations rather than 1,000,000. In some cases, this may be faster.</li>
 					</ul>
 				</div>
diff --git a/resources/js/demo.js b/resources/js/demo.js
index 30371b0..1b4c6c0 100644
--- a/resources/js/demo.js
+++ b/resources/js/demo.js
@@ -238,10 +238,10 @@ function completeFn(results)
 	setTimeout(enableButton, 100);
 }
 
-function errorFn(err)
+function errorFn(err, file)
 {
 	end = now();
-	console.log("ERROR:", err);
+	console.log("ERROR:", err, file);
 	enableButton();
 }
 
diff --git a/resources/js/papaparse.js b/resources/js/papaparse.js
index 7a7914a..fe11b81 100644
--- a/resources/js/papaparse.js
+++ b/resources/js/papaparse.js
@@ -221,6 +221,11 @@
 							if (isFunction(config.complete))
 								config.complete(results);
 						};
+						reader.onerror = function()
+						{
+							if (isFunction(config.error))
+								config.error(reader.error, _input);
+						};
 						reader.readAsText(_input, config.encoding);
 					}
 				}