diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index c6d2576653..ecc1fd6eb5 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -2625,6 +2625,9 @@ Zotero.DragDrop = {
 			var files = [];
 			for (var i=0; i<len; i++) {
 				var file = dt.mozGetDataAt("application/x-moz-file", i);
+				if (!file) {
+					continue;
+				}
 				file.QueryInterface(Components.interfaces.nsIFile);
 				// Don't allow folder drag
 				if (file.isDirectory()) {