From 4d0a7df486c1d281f5ca580ea7ef8e469257c6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A5l=20J=C3=B8rgensen?= <pal.jorgensen@amendor.com>
Date: Thu, 17 Jul 2014 15:04:24 +0200
Subject: [PATCH] Made a null-error-object a non-error

---
 js/h5p-content-upgrade.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/h5p-content-upgrade.js b/js/h5p-content-upgrade.js
index 9318c9f..75e304a 100644
--- a/js/h5p-content-upgrade.js
+++ b/js/h5p-content-upgrade.js
@@ -77,7 +77,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 {