diff --git a/scripts-available/CDB_FederatedServer.sql b/scripts-available/CDB_FederatedServer.sql
index b3b821a..67ca036 100644
--- a/scripts-available/CDB_FederatedServer.sql
+++ b/scripts-available/CDB_FederatedServer.sql
@@ -273,9 +273,13 @@ DECLARE
     server_internal text := @extschema@.__CDB_FS_Generate_Server_Name(input_name := server, check_existence := true);
     role_name name := @extschema@.__CDB_FS_Generate_Server_Role_Name(server_internal);
 BEGIN
-    EXECUTE FORMAT ('DROP USER MAPPING FOR public SERVER %I', server_internal);
-    EXECUTE FORMAT ('DROP OWNED BY %I CASCADE', role_name);
-    EXECUTE FORMAT ('DROP ROLE %I', role_name);
+    BEGIN
+        EXECUTE FORMAT ('DROP USER MAPPING FOR public SERVER %I', server_internal);
+        EXECUTE FORMAT ('DROP OWNED BY %I CASCADE', role_name);
+        EXECUTE FORMAT ('DROP ROLE %I', role_name);
+    EXCEPTION WHEN OTHERS THEN
+        RAISE EXCEPTION 'Unnecessary permissions to drop the server "%": %', server, SQLERRM;
+    END;
 END
 $$
 LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
diff --git a/test/CDB_FederatedServer.sql b/test/CDB_FederatedServer.sql
index 69c07a5..5371235 100644
--- a/test/CDB_FederatedServer.sql
+++ b/test/CDB_FederatedServer.sql
@@ -6,9 +6,13 @@ SET SESSION AUTHORIZATION postgres;
 CREATE EXTENSION postgres_fdw;
 \set QUIET off
 
--- Register a new server
+\echo "List empty servers shows nothing"
 SELECT '1.1', cartodb.CDB_Federated_Server_List_Servers();
+
+\echo "List non-existent server shows nothing"
 SELECT '1.2', cartodb.CDB_Federated_Server_List_Servers(server := 'doesNotExist');
+
+\echo "Create and list a server works"
 SELECT '1.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote'::text, config := '{
     "server": {
         "host": "localhost",
@@ -21,7 +25,7 @@ SELECT '1.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote'::tex
 }'::jsonb);
 SELECT '1.4', cartodb.CDB_Federated_Server_List_Servers();
 
--- Register a second server
+\echo "Create and list a second server works"
 SELECT '2.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::text, config := '{
     "server": {
         "dbname": "fdw_target",
@@ -38,11 +42,12 @@ SELECT '2.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::te
     }
 }'::jsonb);
 SELECT '2.2', cartodb.CDB_Federated_Server_List_Servers();
--- Check that CDB_Federated_Server_List_Servers works with name
+
+\echo "List server by name works"
 SELECT '2.3', cartodb.CDB_Federated_Server_List_Servers(server := 'myRemote');
 
 
--- Re-register the second server
+\echo "Re-register a second server works"
 SELECT '3.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::text, config := '{
     "server": {
         "dbname": "fdw_target",
@@ -60,21 +65,24 @@ SELECT '3.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote2'::te
 }'::jsonb);
 SELECT '3.2', cartodb.CDB_Federated_Server_List_Servers();
 
--- Unregister #1
+\echo "Unregister server 1 works"
 SELECT '4.1', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote'::text);
 SELECT '4.2', cartodb.CDB_Federated_Server_List_Servers();
 
--- Unregister a server that doesn't exist
+\echo "Unregistering a server that doesn't exist fails"
 SELECT '5.1', cartodb.CDB_Federated_Server_Unregister(server := 'doesNotExist'::text);
 
--- Unregister #2
+\echo "Unregister the second server works"
 SELECT '6.1', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote2'::text);
 SELECT '6.2', cartodb.CDB_Federated_Server_List_Servers();
 
--- Test empty config
+\echo "Create a server with NULL name fails"
 SELECT '7.0', cartodb.CDB_Federated_Server_Register_PG(server := NULL::text, config := '{ "server": {}, "credentials" : {}}');
+\echo "Create a server with NULL config fails"
+SELECT '7.01', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := NULL::jsonb);
+\echo "Create a server with empty config fails"
 SELECT '7.1', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{}');
--- Test without passing credentials
+\echo "Create a server without credentials fails"
 SELECT '7.2', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{
     "server": {
         "dbname": "fdw_target",
@@ -86,7 +94,7 @@ SELECT '7.2', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text,
         "fetch_size": "1000"
     }
 }'::jsonb);
--- Test with empty credentials
+\echo "Create a server with empty credentials works"
 SELECT '7.3', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{
     "server": {
         "dbname": "fdw_target",
@@ -101,7 +109,7 @@ SELECT '7.3', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text,
 }'::jsonb);
 SELECT '7.4', cartodb.CDB_Federated_Server_List_Servers();
 SELECT '7.5', cartodb.CDB_Federated_Server_Unregister(server := 'empty'::text);
--- Test without without server options
+\echo "Create a server without options fails"
 SELECT '7.6', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text, config := '{
     "credentials": {
         "username": "other_remote_user",
@@ -109,7 +117,7 @@ SELECT '7.6', cartodb.CDB_Federated_Server_Register_PG(server := 'empty'::text,
     }
 }'::jsonb);
 
--- Should work ok with special characters
+\echo "Create a server with special characters works"
 SELECT '8.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote" or''not'::text, config := '{
     "server": {
         "dbname": "fdw target",
@@ -128,9 +136,6 @@ SELECT '8.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote" or''
 SELECT '8.2', cartodb.CDB_Federated_Server_List_Servers();
 SELECT '8.3', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote" or''not'::text);
 
--- Should throw when trying to unregistering a server that doesn't exists
-SELECT '8.4', cartodb.CDB_Federated_Server_Unregister(server := 'Does not exist'::text);
-
 -- Test permissions
 \set QUIET on
 
@@ -156,9 +161,10 @@ SELECT '9.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote3'::te
 
 \c contrib_regression cdb_fs_tester
 
--- A normal user can list existing servers
+\echo "All users are able to list servers"
 SELECT '9.2', cartodb.CDB_Federated_Server_List_Servers();
--- Creating a server without superadmin should fail
+
+\echo "Only superadmins can create servers"
 SELECT '9.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote4'::text, config := '{
     "server": {
         "host": "localhost",
@@ -173,20 +179,42 @@ SELECT '9.3', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote4'::te
 
 \c contrib_regression postgres
 
+\echo "Granting access to a user works"
 SELECT '9.5', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', usernames := ARRAY['cdb_fs_tester']);
 SELECT '9.6', cartodb.CDB_Federated_Server_Grant_Access(server := 'does not exist', usernames := ARRAY['cdb_fs_tester']);
 SELECT '9.7', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', usernames := ARRAY['does not exist']);
 
--- Grant again raises a notice
+\echo "Granting access again raises a notice"
 SELECT '9.8', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', usernames := ARRAY['cdb_fs_tester']);
 
--- Revoke works
+\echo "Revoking access to a user works"
 SELECT '9.9', cartodb.CDB_Federated_Server_Revoke_Access(server := 'myRemote3', usernames := ARRAY['cdb_fs_tester']);
 SELECT '9.10', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote3', usernames := ARRAY['cdb_fs_tester']);
 
--- Dropping the server without revoking access works
+\echo "Unregistering a server with active grants works"
 SELECT '9.11', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote3'::text);
 
+
+\echo "A user with granted access can't drop a server"
+SELECT '10.1', cartodb.CDB_Federated_Server_Register_PG(server := 'myRemote4'::text, config := '{
+    "server": {
+        "host": "localhost",
+        "port": @@PGPORT@@
+    },
+    "credentials": {
+        "username": "fdw_user",
+        "password": "foobarino"
+    }
+}'::jsonb);
+SELECT '10.2', cartodb.CDB_Federated_Server_Grant_Access(server := 'myRemote4', usernames := ARRAY['cdb_fs_tester']);
+
+\c contrib_regression cdb_fs_tester
+SELECT '10.3', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote4'::text);
+
+\c contrib_regression postgres
+SELECT '10.4', cartodb.CDB_Federated_Server_Unregister(server := 'myRemote4'::text);
+
+
 -- Cleanup
 \set QUIET on
 DROP SCHEMA cdb_fs_tester CASCADE;
@@ -194,5 +222,3 @@ REVOKE CONNECT ON DATABASE contrib_regression FROM cdb_fs_tester;
 DROP ROLE cdb_fs_tester;
 DROP EXTENSION postgres_fdw;
 \set QUIET off
-
-
diff --git a/test/CDB_FederatedServer_expect b/test/CDB_FederatedServer_expect
index 3c11692..290c234 100644
--- a/test/CDB_FederatedServer_expect
+++ b/test/CDB_FederatedServer_expect
@@ -1,38 +1,68 @@
+"List empty servers shows nothing"
+"List non-existent server shows nothing"
+"Create and list a server works"
 1.3|
 1.4|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user)
+"Create and list a second server works"
 2.1|
 2.2|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user)
 2.2|(myRemote2,postgres_fdw,localhost,5432,fdw_target,read-only,fdw_user)
+"List server by name works"
 2.3|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user)
+"Re-register a second server works"
 3.1|
 3.2|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user)
 3.2|(myRemote2,postgres_fdw,localhost,5432,fdw_target,read-only,other_remote_user)
+"Unregister server 1 works"
 4.1|
 4.2|(myRemote2,postgres_fdw,localhost,5432,fdw_target,read-only,other_remote_user)
+"Unregistering a server that doesn't exist fails"
 ERROR:  Server "doesNotExist" does not exist
+"Unregister the second server works"
 6.1|
+"Create a server with NULL name fails"
 ERROR:  Server name cannot be NULL
+"Create a server with NULL config fails"
+7.01|
+"Create a server with empty config fails"
 ERROR:  Server information is mandatory
+"Create a server without credentials fails"
 ERROR:  Credentials are mandatory
+"Create a server with empty credentials works"
 7.3|
 7.4|(empty,postgres_fdw,localhost,5432,fdw_target,read-only,)
 7.5|
+"Create a server without options fails"
 ERROR:  Server information is mandatory
+"Create a server with special characters works"
 8.1|
 8.2|("myRemote"" or'not",postgres_fdw,localhost,5432,"fdw target",read-only,"fdw user")
 8.3|
-ERROR:  Server "Does not exist" does not exist
 
 9.1|
 You are now connected to database "contrib_regression" as user "cdb_fs_tester".
+"All users are able to list servers"
 9.2|(myRemote3,postgres_fdw,localhost,5432,,read-only,)
+"Only superadmins can create servers"
 ERROR:  Could not create server myRemote4: permission denied for foreign-data wrapper postgres_fdw
 You are now connected to database "contrib_regression" as user "postgres".
+"Granting access to a user works"
 9.5|
 ERROR:  Server "does not exist" does not exist
 ERROR:  User role "does not exist" does not exists
+"Granting access again raises a notice"
 NOTICE:  role "cdb_fs_tester" is already a member of role "cdb_fs_role_95b63382aabca4433e7bd9cba6c30368"
 9.8|
+"Revoking access to a user works"
 9.9|
 9.10|
+"Unregistering a server with active grants works"
 9.11|
+"A user with granted access can't drop a server"
+10.1|
+10.2|
+You are now connected to database "contrib_regression" as user "cdb_fs_tester".
+WARNING:  no privileges could be revoked for "postgres_fdw"
+ERROR:  Unnecessary permissions to drop the server "myRemote4": permission denied to drop role
+You are now connected to database "contrib_regression" as user "postgres".
+10.4|