diff --git a/src/components/flow/actions/changegroups/addgroups/AddGroupsForm.tsx b/src/components/flow/actions/changegroups/addgroups/AddGroupsForm.tsx
index 337f41459..567ee0d66 100644
--- a/src/components/flow/actions/changegroups/addgroups/AddGroupsForm.tsx
+++ b/src/components/flow/actions/changegroups/addgroups/AddGroupsForm.tsx
@@ -94,7 +94,7 @@ export default class AddGroupsForm extends React.Component<ActionFormProps, Chan
           placeholder={i18n.t('select_groups', 'Select Collection')}
           expressions={true}
           // Groups can be created on the fly
-          createPrefix={i18n.t('create_group', 'Create Collection') + ': '}
+          // createPrefix={i18n.t('create_group', 'Create Collection') + ': '}
           createAssetFromInput={this.handleCreateAssetFromInput}
           onAssetCreated={this.handleGroupAdded}
         />
diff --git a/src/components/flow/actions/sendbroadcast/SendBroadcast.tsx b/src/components/flow/actions/sendbroadcast/SendBroadcast.tsx
index c8dbf95cb..2f52692e8 100644
--- a/src/components/flow/actions/sendbroadcast/SendBroadcast.tsx
+++ b/src/components/flow/actions/sendbroadcast/SendBroadcast.tsx
@@ -18,37 +18,30 @@ const SendBroadcastComp: React.SFC<BroadcastMsg> = (
   context: any
 ): JSX.Element => {
   const assets = getRecipients(action);
-  if (action.text) {
-    return (
-      <div className={styles.node}>
-        <div className={styles.to} key={action.uuid + '_broadcast_recipients'}>
-          {renderAssetList(assets, MAX_TO_SHOW, context.config.endpoints)}
-        </div>
-        <div className={styles.message}>
-          {action.text.split(/\r?\n/).map((line: string, idx: number) => (
+
+  return (
+    <div className={styles.node}>
+      <div className={styles.to} key={action.uuid + '_broadcast_recipients'}>
+        {renderAssetList(assets, MAX_TO_SHOW, context.config.endpoints)}
+      </div>
+      <div className={styles.message}>
+        {action.text &&
+          action.text.split(/\r?\n/).map((line: string, idx: number) => (
             <div key={action.uuid + idx} className={styles.line}>
               {line}
             </div>
           ))}
-          <div className={styles.icons}>
-            {action.attachments && action.attachments.length > 0 ? (
-              <div className={`${styles.attachment} fe-paperclip`} />
-            ) : null}
-            {action.templating && action.templating.template ? (
-              <div className={`${styles.whatsapp} fe-whatsapp`} />
-            ) : null}
-          </div>
+        <div className={styles.icons}>
+          {action.attachments && action.attachments.length > 0 ? (
+            <div className={`${styles.attachment} fe-paperclip`} />
+          ) : null}
+          {action.templating && action.templating.template ? (
+            <div className={`${styles.whatsapp} fe-whatsapp`} />
+          ) : null}
         </div>
       </div>
-    );
-  }
-  if (action.attachments && action.attachments.length > 0) {
-    return <div className={`${styles.attachment} fe-paperclip`} />;
-  }
-  if (action.templating && action.templating.template) {
-    return <div className={`${styles.whatsapp} fe-whatsapp`} />;
-  }
-  return <div className="placeholder">{PLACEHOLDER}</div>;
+    </div>
+  );
 };
 
 SendBroadcastComp.contextTypes = {
diff --git a/src/components/flow/actions/sendbroadcast/SendBroadcastForm.tsx b/src/components/flow/actions/sendbroadcast/SendBroadcastForm.tsx
index 2d0be4bf4..e1f89dd87 100644
--- a/src/components/flow/actions/sendbroadcast/SendBroadcastForm.tsx
+++ b/src/components/flow/actions/sendbroadcast/SendBroadcastForm.tsx
@@ -138,7 +138,7 @@ export default class SendBroadcastForm extends React.Component<
             this.setState({ valid });
           }
         } else {
-          this.setState({ attachmentError: `Not a valid ${type} url` });
+          this.setState({ attachmentError: response.data.message });
         }
       })
       .catch(error => {
@@ -387,7 +387,7 @@ export default class SendBroadcastForm extends React.Component<
             </>
           ) : null}
         </div>
-        {this.state.validAttachment && !this.state.attachmentError ? (
+        {this.state.valid && this.state.validAttachment && !this.state.attachmentError ? (
           <div className={styles.loading}>
             Checking URL validity
             <Loading size={10} units={6} color="#999999" />
@@ -427,6 +427,14 @@ export default class SendBroadcastForm extends React.Component<
     );
   }
 
+  private checkAttachmentErrors(): boolean {
+    if (this.state.valid) {
+      return this.state.validAttachment;
+    } else {
+      return false;
+    }
+  }
+
   public render(): JSX.Element {
     const typeConfig = this.props.typeConfig;
 
@@ -441,7 +449,7 @@ export default class SendBroadcastForm extends React.Component<
       name: 'Attachments',
       body: this.renderAttachments(),
       checked: this.state.attachments.length > 0,
-      hasErrors: this.state.validAttachment
+      hasErrors: this.checkAttachmentErrors()
     };
     return (
       <Dialog
diff --git a/src/components/flow/actions/sendmsg/SendMsgForm.tsx b/src/components/flow/actions/sendmsg/SendMsgForm.tsx
index 7302aae38..54df31185 100644
--- a/src/components/flow/actions/sendmsg/SendMsgForm.tsx
+++ b/src/components/flow/actions/sendmsg/SendMsgForm.tsx
@@ -183,7 +183,7 @@ export default class SendMsgForm extends React.Component<ActionFormProps, SendMs
             this.setState({ templateVariables, valid });
           }
         } else {
-          this.setState({ attachmentError: `Not a valid ${type} url` });
+          this.setState({ attachmentError: response.data.message });
         }
       })
       .catch(error => {