diff --git a/webapp/components/backstage/add_incoming_webhook.jsx b/webapp/components/backstage/add_incoming_webhook.jsx
index afeb9d5692..f3601cb073 100644
--- a/webapp/components/backstage/add_incoming_webhook.jsx
+++ b/webapp/components/backstage/add_incoming_webhook.jsx
@@ -72,6 +72,7 @@ export default class AddIncomingWebhook extends React.Component {
             },
             (err) => {
                 this.setState({
+                    saving: false,
                     serverError: err.message
                 });
             }
@@ -125,6 +126,7 @@ export default class AddIncomingWebhook extends React.Component {
                                 <input
                                     id='displayName'
                                     type='text'
+                                    maxLength='64'
                                     className='form-control'
                                     value={this.state.displayName}
                                     onChange={this.updateDisplayName}
@@ -145,6 +147,7 @@ export default class AddIncomingWebhook extends React.Component {
                                 <input
                                     id='description'
                                     type='text'
+                                    maxLength='128'
                                     className='form-control'
                                     value={this.state.description}
                                     onChange={this.updateDescription}
diff --git a/webapp/components/backstage/add_outgoing_webhook.jsx b/webapp/components/backstage/add_outgoing_webhook.jsx
index c2b5e0414d..ef57c6d050 100644
--- a/webapp/components/backstage/add_outgoing_webhook.jsx
+++ b/webapp/components/backstage/add_outgoing_webhook.jsx
@@ -92,6 +92,7 @@ export default class AddOutgoingWebhook extends React.Component {
             },
             (err) => {
                 this.setState({
+                    saving: false,
                     serverError: err.message
                 });
             }
@@ -157,6 +158,7 @@ export default class AddOutgoingWebhook extends React.Component {
                                 <input
                                     id='displayName'
                                     type='text'
+                                    maxLength='64'
                                     className='form-control'
                                     value={this.state.displayName}
                                     onChange={this.updateDisplayName}
@@ -177,6 +179,7 @@ export default class AddOutgoingWebhook extends React.Component {
                                 <input
                                     id='description'
                                     type='text'
+                                    maxLength='128'
                                     className='form-control'
                                     value={this.state.description}
                                     onChange={this.updateDescription}
@@ -215,6 +218,7 @@ export default class AddOutgoingWebhook extends React.Component {
                                 <textarea
                                     id='triggerWords'
                                     rows='3'
+                                    maxLength='1000'
                                     className='form-control'
                                     value={this.state.triggerWords}
                                     onChange={this.updateTriggerWords}
@@ -235,6 +239,7 @@ export default class AddOutgoingWebhook extends React.Component {
                                 <textarea
                                     id='callbackUrls'
                                     rows='3'
+                                    maxLength='1000'
                                     className='form-control'
                                     value={this.state.callbackUrls}
                                     onChange={this.updateCallbackUrls}
diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index cc19baa7e3..db0b2258cb 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -1182,10 +1182,10 @@ export function addIncomingHook(hook, success, error) {
             }
         },
         (err) => {
-            dispatchError(err, 'addIncomingHook');
-
             if (error) {
                 error(err);
+            } else {
+                dispatchError(err, 'addIncomingHook');
             }
         }
     );
@@ -1205,10 +1205,10 @@ export function addOutgoingHook(hook, success, error) {
             }
         },
         (err) => {
-            dispatchError(err, 'addOutgoingHook');
-
             if (error) {
                 error(err);
+            } else {
+                dispatchError(err, 'addOutgoingHook');
             }
         }
     );