diff --git a/js/h5p-content-upgrade.js b/js/h5p-content-upgrade.js
index 9318c9f..d23ed24 100644
--- a/js/h5p-content-upgrade.js
+++ b/js/h5p-content-upgrade.js
@@ -1,3 +1,5 @@
+var H5PUpgrades = H5PUpgrades || {};
+
 (function ($) {
   var info, $container;
   
@@ -77,7 +79,7 @@
      */
     var check = function (err) {
       i++;
-      if (i === (isArray ? obj.length : ids.length) || err !== undefined) {
+      if (i === (isArray ? obj.length : ids.length) || (err !== undefined && err !== null)) {
         finished(err);
       }
       else {
@@ -168,7 +170,7 @@
   ContentUpgrade.prototype.nextBatch = function (outData) {
     var self = this;
     
-    $.post(info.url, outData, function (inData) {
+    $.post(info.infoUrl, outData, function (inData) {
       if (!(inData instanceof Object)) {
         // Print errors from backend
         return self.setStatus(inData);