diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js
index 292e85f4e..151d9da6d 100644
--- a/Scripts/AppLoader.js
+++ b/Scripts/AppLoader.js
@@ -28,7 +28,14 @@ function newAppLoader () {
 
         'Globals.js',
         'Ecosystem.js',
-        'MQService',
+          'MQService',
+
+          'ChartsSpace/ChartUtilities.js',
+          'ChartsSpace/PlottersManager.js',
+          'ChartsSpace/TimelineChart.js',
+          'ChartsSpace/TimeMachine.js',
+          'ChartsSpace/ViewPort.js',
+          'ChartsSpace/TimeLineCoordinateSystem.js',
 
         'TopSpace/CurrentEvent.js',
         'TopSpace/EndUser.js',
@@ -84,13 +91,6 @@ function newAppLoader () {
           'Scales/TimePeriodScale.js',
           'Scales/Commons.js',
 
-        'ChartsSpace/ChartUtilities.js',
-        'ChartsSpace/PlottersManager.js',
-        'ChartsSpace/TimelineChart.js',
-        'ChartsSpace/TimeMachine.js',
-        'ChartsSpace/ViewPort.js',
-        'ChartsSpace/TimeLineCoordinateSystem.js',
-
         'CockpitSpace/AssetBalances.js',
         'CockpitSpace/Speedometer.js',
         'CockpitSpace/RestartSimulation.js', 
diff --git a/Server/AzureStorage.js b/Server/AzureStorage.js
index 1a589b90d..780b20f03 100644
--- a/Server/AzureStorage.js
+++ b/Server/AzureStorage.js
@@ -132,7 +132,13 @@
                             if (CONSOLE_ERROR_LOG === true) { console.log("[ERROR] Azure Storage -> readData -> onFileReceived -> err = " + JSON.stringify(err)); }
                             if (CONSOLE_ERROR_LOG === true) { console.log("[ERROR] Azure Storage -> readData -> onFileReceived -> Returning an empty JSON object string. "); }
 
-                            callBackFunction(global.DEFAULT_FAIL_RESPONSE);
+                            let response = {
+                                result: global.DEFAULT_FAIL_RESPONSE.result,
+                                message: global.DEFAULT_FAIL_RESPONSE.message,
+                                code: 'FileNotFound'
+                            }
+
+                            callBackFunction(response);
                             return;
 
                         }