diff --git a/src/lib/project-fetcher-hoc.jsx b/src/lib/project-fetcher-hoc.jsx
index 1a8322a071c214088249e5cad4b4137c5f3bcc94..47086812f0346a19885a9f1272163ca295d0deb4 100644
--- a/src/lib/project-fetcher-hoc.jsx
+++ b/src/lib/project-fetcher-hoc.jsx
@@ -83,11 +83,12 @@ const ProjectFetcherHOC = function (WrappedComponent) {
             const {
                 /* eslint-disable no-unused-vars */
                 assetHost,
-                onFetchedProjectData: onFetchedProjectDataProp,
                 intl,
+                loadingState,
+                onError: onErrorProp,
+                onFetchedProjectData: onFetchedProjectDataProp,
                 projectHost,
                 projectId,
-                loadingState,
                 reduxProjectId,
                 setProjectId: setProjectIdProp,
                 /* eslint-enable no-unused-vars */
diff --git a/src/lib/project-saver-hoc.jsx b/src/lib/project-saver-hoc.jsx
index 6d85eca4c005603c3848045d79419b6a8fa3ea35..19cd53c23e7d35623a11a96ae0ed0577067fc1c9 100644
--- a/src/lib/project-saver-hoc.jsx
+++ b/src/lib/project-saver-hoc.jsx
@@ -90,14 +90,14 @@ const ProjectSaverHOC = function (WrappedComponent) {
             const {
                 /* eslint-disable no-unused-vars */
                 createProject: createProjectProp,
-                onCreated: onCreatedProp,
-                onUpdated: onUpdatedProp,
-                onError: onErrorProp,
                 isCreating: isCreatingProp,
                 isShowingWithId: isShowingWithIdProp,
                 isShowingWithoutId: isShowingWithoutIdProp,
                 isUpdating: isUpdatingProp,
                 loadingState,
+                onCreated: onCreatedProp,
+                onError: onErrorProp,
+                onUpdated: onUpdatedProp,
                 reduxProjectId,
                 saveProject: saveProjectProp,
                 /* eslint-enable no-unused-vars */
diff --git a/src/lib/vm-manager-hoc.jsx b/src/lib/vm-manager-hoc.jsx
index 6e1d0125cf04f10e35484aebebfebf4f569c2e2a..bc4b1348f568a3e6baba25f16e55ba6fd8b323ef 100644
--- a/src/lib/vm-manager-hoc.jsx
+++ b/src/lib/vm-manager-hoc.jsx
@@ -48,17 +48,18 @@ const vmManagerHOC = function (WrappedComponent) {
                     this.props.onLoadedProject(this.props.loadingState, this.props.canSave);
                 })
                 .catch(e => {
-                    this.props.onError(e);
+                    this.props.onError(`vm-manager-hoc error: ${e}`);
                 });
         }
         render () {
             const {
                 /* eslint-disable no-unused-vars */
                 fontsLoaded,
+                loadingState,
+                onError: onErrorProp,
                 onLoadedProject: onLoadedProjectProp,
                 projectData,
                 projectId,
-                loadingState,
                 /* eslint-enable no-unused-vars */
                 isLoadingWithId: isLoadingWithIdProp,
                 vm,