diff --git a/app-frontend/src/containers/apps/appDetails/AppDetails.tsx b/app-frontend/src/containers/apps/appDetails/AppDetails.tsx
index 6dbbdcf..e729ac3 100644
--- a/app-frontend/src/containers/apps/appDetails/AppDetails.tsx
+++ b/app-frontend/src/containers/apps/appDetails/AppDetails.tsx
@@ -132,7 +132,11 @@ export default class AppDetails extends ApiComponent<
           .then(function() {
             self.goBackToApps();
           })
-          .catch(Toaster.createCatcher());
+          .catch(
+            Toaster.createCatcher(function() {
+              self.setState({ isLoading: false });
+            })
+          );
       },
       onCancel() {
         // do nothing
diff --git a/app-frontend/src/containers/apps/appDetails/HttpSettings.tsx b/app-frontend/src/containers/apps/appDetails/HttpSettings.tsx
index fc2db5a..0d43144 100644
--- a/app-frontend/src/containers/apps/appDetails/HttpSettings.tsx
+++ b/app-frontend/src/containers/apps/appDetails/HttpSettings.tsx
@@ -47,7 +47,11 @@ export default class HttpSettings extends Component<
       .then(function() {
         self.reFetchData();
       })
-      .catch(Toaster.createCatcher());
+      .catch(
+        Toaster.createCatcher(function() {
+          self.props.setLoading(false);
+        })
+      );
   }
 
   onConnectNewDomainClicked(newDomain: string) {
@@ -67,7 +71,11 @@ export default class HttpSettings extends Component<
       .then(function() {
         self.reFetchData();
       })
-      .catch(Toaster.createCatcher());
+      .catch(
+        Toaster.createCatcher(function() {
+          self.props.setLoading(false);
+        })
+      );
   }
 
   onEnableCustomDomainSslClicked(customDomain: string) {
@@ -87,7 +95,11 @@ export default class HttpSettings extends Component<
       .then(function() {
         self.reFetchData();
       })
-      .catch(Toaster.createCatcher());
+      .catch(
+        Toaster.createCatcher(function() {
+          self.props.setLoading(false);
+        })
+      );
   }
 
   onRemoveCustomDomainClicked(customDomain: string) {
@@ -107,7 +119,11 @@ export default class HttpSettings extends Component<
       .then(function() {
         self.reFetchData();
       })
-      .catch(Toaster.createCatcher());
+      .catch(
+        Toaster.createCatcher(function() {
+          self.props.setLoading(false);
+        })
+      );
   }
 
   createCustomDomainRows() {
diff --git a/app-frontend/src/containers/apps/appDetails/deploy/Deployment.tsx b/app-frontend/src/containers/apps/appDetails/deploy/Deployment.tsx
index 8ecc7a2..a4e8547 100644
--- a/app-frontend/src/containers/apps/appDetails/deploy/Deployment.tsx
+++ b/app-frontend/src/containers/apps/appDetails/deploy/Deployment.tsx
@@ -73,6 +73,8 @@ export default class Deployment extends ApiComponent<
         self.props.apiData.appDefinition.appName!,
         {
           schemaVersion: 2,
+          // We should use imageName, but since imageName does not report build failure (since there is no build!)
+          // If we use that, and the image is not available, the service will not work.
           dockerfileLines: ["FROM " + version.deployedImageName]
         },
         version.gitHash || "",