diff --git a/src/caosdb/common/administration.py b/src/caosdb/common/administration.py
index 5b7a098a58463489eec9b827c8baa1c90a580e13..e7ba94182d7a4d8b60c6400cd1d804f62f7bf03c 100644
--- a/src/caosdb/common/administration.py
+++ b/src/caosdb/common/administration.py
@@ -32,7 +32,10 @@ from caosdb.common.utils import xml2str
 from caosdb.connection.connection import get_connection
 from caosdb.exceptions import (HTTPClientError,
                                HTTPForbiddenError,
-                               HTTPResourceNotFoundError)
+                               HTTPResourceNotFoundError,
+                               EntityDoesNotExistError,
+                               ServerConfigurationException,
+                               )
 
 
 def set_server_property(key, value):
diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py
index bcad5d7c9288a79867da864e007e2f3b813fd562..2cb31f425b14bf382fae32f62af79a4bd6ef0301 100644
--- a/src/caosdb/connection/connection.py
+++ b/src/caosdb/connection/connection.py
@@ -615,8 +615,7 @@ class _Connection(object):  # pylint: disable=useless-object-inheritance
     def get_username(self):
         """
         Return the username of the current connection.
-        
+
         Shortcut for: get_connection()._authenticator._credentials_provider.username
         """
         return self._authenticator._credentials_provider.username
-