Fix #2351

Author: canstudios-simonasd

frontend/src/modules/editor/global/editorDataLoader.js

@@ -89,8 +89,11 @@ define(function(require) {
         });
       }
       // fetch all collections
-      fetchEditorData(courseData, function() {
+      fetchEditorData(courseData, function(error) {
         if(_.isFunction(callback)) callback();
+        if (error) {
+          Origin.trigger('editor:failedToLoad');
+        }
         loadingCourseData = false;
         Origin.trigger('editor:dataLoaded');
       });
@@ -109,9 +112,15 @@ define(function(require) {
         if(preloader.hasLoadedData()) {
           Origin.off('editor:dataPreloaded', done);
           Origin.off('editor:dataLoaded', done);
+          Origin.off('editor:failedToLoad', removeEvents);
           callback.apply(this);
         }
-      }
+      };
+      var removeEvents = function() {
+        Origin.off('editor:dataPreloaded', done);
+        Origin.off('editor:dataLoaded', done);
+        Origin.off('editor:failedToLoad', removeEvents);
+      };
       // in case we've already loaded
       done();
 
@@ -121,6 +130,7 @@ define(function(require) {
       if(!preloader.hasLoadedCourseData()) {
         Origin.on('editor:dataLoaded', done);
       }
+      Origin.on('editor:failedToLoad', removeEvents);
     },
     /**
     * Uses the below checks to test loading status
@@ -176,7 +186,10 @@ define(function(require) {
           data[collection._type] = true;
           if(callback && isAllDataLoaded(data)) callback.apply(this);
         },
-        error: onFetchError
+        error: function(error) {
+          onFetchError();
+          callback(error);
+        }
       });
     }
   }
@@ -216,6 +229,7 @@ define(function(require) {
       type: 'error',
       text: Origin.l10n.t('app.errorgeneric')
     });
+    Origin.router.navigateTo('dashboard');
   }
 
   /**