diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 8dc27ba5d6..3f5b0319f8 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -277,8 +277,8 @@
 /**
  * @typedef {Object} olx.interaction.DragAndDropOptions
  * @property {boolean|undefined} fitView Fit view.  Default is `true`.
- * @property {Array.<function(new: ol.format.Format)>|undefined}
- *     formatConstructors Format constructors.
+ * @property {Array.<function(new: ol.format.Format)>|undefined} formatConstructors
+ *     Format constructors.
  * @property {ol.source.Vector|undefined} source Source.  If this is defined
  *     then features will be added to this source.
  * @property {ol.layer.Vector|undefined} layer Layer.  If this is defined then
diff --git a/src/ol/format/geojsonformat.js b/src/ol/format/geojsonformat.js
index 9c4acc76f9..8d975f6a4c 100644
--- a/src/ol/format/geojsonformat.js
+++ b/src/ol/format/geojsonformat.js
@@ -331,7 +331,7 @@ ol.format.GeoJSON.prototype.readFeaturesFromObject = function(object) {
     return features;
   } else {
     goog.asserts.fail();
-    return null;
+    return [];
   }
 };
 
diff --git a/src/ol/format/xmlformat.js b/src/ol/format/xmlformat.js
index e957102d82..0025cbd452 100644
--- a/src/ol/format/xmlformat.js
+++ b/src/ol/format/xmlformat.js
@@ -79,7 +79,7 @@ ol.format.XML.prototype.readFeatures = function(source) {
     return this.readFeaturesFromDocument(doc);
   } else {
     goog.asserts.fail();
-    return null;
+    return [];
   }
 };
 
diff --git a/src/ol/source/vectorfilesource.js b/src/ol/source/vectorfilesource.js
index 865f647e55..b43fcc68bf 100644
--- a/src/ol/source/vectorfilesource.js
+++ b/src/ol/source/vectorfilesource.js
@@ -3,6 +3,7 @@
 goog.provide('ol.source.VectorFile');
 
 goog.require('goog.asserts');
+goog.require('goog.dom.xml');
 goog.require('goog.net.XhrIo');
 goog.require('ol.format.FormatType');
 goog.require('ol.proj');
@@ -83,6 +84,9 @@ ol.source.VectorFile.prototype.handleXhrIo_ = function(event) {
       source = xhrIo.getResponseText();
     } else if (type == ol.format.FormatType.XML) {
       source = xhrIo.getResponseXml();
+      if (goog.isNull(source)) {
+        source = goog.dom.xml.loadXml(xhrIo.getResponseText());
+      }
     } else {
       goog.asserts.fail();
     }