diff --git a/src/components/RequestGroupComposition/RequestGroup.vue b/src/components/RequestGroupComposition/RequestGroup.vue
index 9bd3161..c7a62c7 100644
--- a/src/components/RequestGroupComposition/RequestGroup.vue
+++ b/src/components/RequestGroupComposition/RequestGroup.vue
@@ -24,7 +24,7 @@
             <custom-field
               v-model="requestGroup.name"
               field="name"
-              :label="getFromObject(formConfig, ['requestGroup', 'name', 'label'], 'Name')"
+              :label="getFromObject(formConfig, ['requestGroup', 'name', 'label'], 'Request Name')"
               :desc="getFromObject(formConfig, ['requestGroup', 'name', 'desc'], '')"
               :hide="getFromObject(formConfig, ['requestGroup', 'name', 'hide'], false)"
               :errors="errors.name"
diff --git a/src/components/RequestGroupComposition/Window.vue b/src/components/RequestGroupComposition/Window.vue
index bd96169..968ca6a 100644
--- a/src/components/RequestGroupComposition/Window.vue
+++ b/src/components/RequestGroupComposition/Window.vue
@@ -193,7 +193,12 @@ export default {
   },
   computed: {
     topLevelErrors: function() {
-      return extractTopLevelErrors(this.errors);
+      let combinedError = extractTopLevelErrors(this.errors);
+      // If showAirmass is false, it means that the airmassData is actually an error message returned from the endpoint
+      if (!this.showAirmass) {
+        combinedError = _.concat(combinedError, extractTopLevelErrors(this.airmassData));
+      }
+      return combinedError;
     }
   },
   methods: {