diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java
index 8f9475c1..642bebe5 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java
@@ -16,10 +16,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import ch.ethz.seb.sebserver.gbl.Constants;
 import ch.ethz.seb.sebserver.gbl.api.EntityType;
 import ch.ethz.seb.sebserver.gbl.api.POSTMapper;
 import ch.ethz.seb.sebserver.gbl.model.Activatable;
 import ch.ethz.seb.sebserver.gbl.model.Domain.INSTITUTION;
+import ch.ethz.seb.sebserver.gbl.model.Entity;
 import ch.ethz.seb.sebserver.gbl.model.GrantEntity;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -115,6 +117,17 @@ public final class Institution implements GrantEntity, Activatable {
         return this.active;
     }
 
+    @Override
+    public Entity printSecureCopy() {
+        return new Institution(
+                this.id,
+                this.name,
+                this.urlSuffix,
+                Constants.EMPTY_NOTE,
+                this.themeName,
+                this.active);
+    }
+
     @Override
     public String toString() {
         final StringBuilder builder = new StringBuilder();
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java b/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java
index f5bccfe6..5937cf04 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java
@@ -422,6 +422,11 @@ public final class Form implements FormBinding {
                 return;
             }
 
+            if (errorMessage == null) {
+                resetError();
+                return;
+            }
+
             if (!this.hasError) {
                 this.control.setData(RWT.CUSTOM_VARIANT, CustomVariant.ERROR.key);
                 this.errorLabel.setText("- " + errorMessage);
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/auth/OAuth2AuthorizationContextHolder.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/auth/OAuth2AuthorizationContextHolder.java
index ef7916de..7681a5fc 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/auth/OAuth2AuthorizationContextHolder.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/auth/OAuth2AuthorizationContextHolder.java
@@ -292,6 +292,11 @@ public class OAuth2AuthorizationContextHolder implements AuthorizationContextHol
 
             @Override
             public boolean hasError(final ClientHttpResponse response) throws IOException {
+                final boolean hasError = super.hasError(response);
+                if (hasError) {
+                    return hasError;
+                }
+
                 final HttpStatus statusCode = HttpStatus.resolve(response.getRawStatusCode());
                 return (statusCode != null && statusCode.series() == HttpStatus.Series.SERVER_ERROR);
             }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/ImageUpload.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/ImageUpload.java
index dbb6b573..015e2897 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/ImageUpload.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/ImageUpload.java
@@ -181,7 +181,7 @@ public final class ImageUpload extends Composite {
             context.layout();
             imageUpload.layout();
             imageUpload.loadNewImage = false;
-            imageUpload.errorHandler.accept("");
+            imageUpload.errorHandler.accept(null);
         }
     }