diff --git a/Composer/packages/client/src/recoilModel/dispatchers/storage.ts b/Composer/packages/client/src/recoilModel/dispatchers/storage.ts
index 0a471782a5..19107dcbb6 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/storage.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/storage.ts
@@ -20,7 +20,7 @@ import {
 import { FileTypes } from '../../constants';
 import { getExtension } from '../../utils/fileUtil';
 
-import { logMessage } from './shared';
+import { logMessage, setError } from './shared';
 
 const projectFiles = ['bot', 'botproj'];
 
@@ -197,6 +197,11 @@ export const storageDispatcher = () => {
       set(featureFlagsState, response.data);
     } catch (ex) {
       logMessage(callbackHelpers, `Error fetching feature flag data: ${ex}`);
+
+      if (process.env.NODE_ENV === 'development') {
+        const err = new Error(`Error fetching feature flag data: ${ex.message}`);
+        setError(callbackHelpers, err);
+      }
     }
   });
 
diff --git a/Composer/packages/server/src/services/featureFlags.ts b/Composer/packages/server/src/services/featureFlags.ts
index 6aba4c44ab..3c7131b926 100644
--- a/Composer/packages/server/src/services/featureFlags.ts
+++ b/Composer/packages/server/src/services/featureFlags.ts
@@ -28,9 +28,9 @@ export class FeatureFlagService {
       FeatureFlagService.currentFeatureFlagMap[key] = {
         ...FeatureFlagService.defaultFeatureFlags[key],
         ...FeatureFlagService.currentFeatureFlagMap[key],
-        displayName: FeatureFlagService.defaultFeatureFlags[key].displayName,
-        description: FeatureFlagService.defaultFeatureFlags[key].description,
-        documentationLink: FeatureFlagService.defaultFeatureFlags[key].documentationLink,
+        displayName: FeatureFlagService.defaultFeatureFlags[key]?.displayName,
+        description: FeatureFlagService.defaultFeatureFlags[key]?.description,
+        documentationLink: FeatureFlagService.defaultFeatureFlags[key]?.documentationLink,
       };
     });