diff --git a/src/grp_query_drv_dummy.cc b/src/grp_query_drv_dummy.cc
index 02081f8..febefed 100644
--- a/src/grp_query_drv_dummy.cc
+++ b/src/grp_query_drv_dummy.cc
@@ -15,7 +15,7 @@ namespace pEp {
         pEpLogClass("called");
     }
 
-    PEP_STATUS GroupQueryDriverDummy::group_query_groups(PEP_SESSION session, identity_list **groups)
+    PEP_STATUS GroupQueryDriverDummy::group_query_groups(PEP_SESSION session, identity_list **groups) noexcept
     {
         pEpLogClass("called");
         return PEP_STATUS_OK;
@@ -24,7 +24,7 @@ namespace pEp {
     PEP_STATUS GroupQueryDriverDummy::group_query_manager(
         PEP_SESSION session,
         const pEp_identity *const group,
-        pEp_identity **manager)
+        pEp_identity **manager) noexcept
     {
         pEpLogClass("called");
         return PEP_STATUS_OK;
@@ -33,7 +33,7 @@ namespace pEp {
     PEP_STATUS GroupQueryDriverDummy::group_query_members(
         PEP_SESSION session,
         const pEp_identity *const group,
-        identity_list **members)
+        identity_list **members) noexcept
     {
         pEpLogClass("called");
         return PEP_STATUS_OK;
diff --git a/src/grp_query_drv_dummy.hh b/src/grp_query_drv_dummy.hh
index a262768..e83d40c 100644
--- a/src/grp_query_drv_dummy.hh
+++ b/src/grp_query_drv_dummy.hh
@@ -15,15 +15,15 @@ namespace pEp {
         GroupQueryDriverDummy() = delete;
         GroupQueryDriverDummy(const std::string &db_path);
 
-        PEP_STATUS group_query_groups(PEP_SESSION session, identity_list **groups) override;
+        PEP_STATUS group_query_groups(PEP_SESSION session, identity_list **groups) noexcept override;
         PEP_STATUS group_query_manager(
             PEP_SESSION session,
             const pEp_identity *const group,
-            pEp_identity **manager) override;
+            pEp_identity **manager) noexcept override;
         PEP_STATUS group_query_members(
             PEP_SESSION session,
             const pEp_identity *const group,
-            identity_list **members) override;
+            identity_list **members) noexcept override;
 
         // Logging
         static bool log_enabled;
diff --git a/src/grp_query_interface.hh b/src/grp_query_interface.hh
index 200f3d9..0620db0 100644
--- a/src/grp_query_interface.hh
+++ b/src/grp_query_interface.hh
@@ -10,17 +10,17 @@
 namespace pEp {
     class GroupQueryInterface {
     public:
-        virtual PEP_STATUS group_query_groups(PEP_SESSION session, identity_list **groups) = 0;
+        virtual PEP_STATUS group_query_groups(PEP_SESSION session, identity_list **groups) noexcept = 0;
 
         virtual PEP_STATUS group_query_manager(
             PEP_SESSION session,
             const pEp_identity *const group,
-            pEp_identity **manager) = 0;
+            pEp_identity **manager) noexcept = 0;
 
         virtual PEP_STATUS group_query_members(
             PEP_SESSION session,
             const pEp_identity *const group,
-            identity_list **members) = 0;
+            identity_list **members) noexcept = 0;
 
     private:
     };
diff --git a/src/grp_update_drv_dummy.cc b/src/grp_update_drv_dummy.cc
index 45e3472..0ed32bb 100644
--- a/src/grp_update_drv_dummy.cc
+++ b/src/grp_update_drv_dummy.cc
@@ -18,7 +18,7 @@ namespace pEp {
         PEP_SESSION session,
         pEp_identity *group_identity,
         pEp_identity *manager,
-        identity_list *memberlist)
+        identity_list *memberlist) noexcept
     {
         pEpLogClass("called");
         string addr_list = group_identity->address;
@@ -32,7 +32,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverDummy::adapter_group_join(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *as_member)
+        pEp_identity *as_member) noexcept
     {
         pEpLogClass("called");
         return PEP_STATUS_OK;
@@ -41,7 +41,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverDummy::adapter_group_dissolve(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *manager)
+        pEp_identity *manager) noexcept
     {
         pEpLogClass("called");
 
@@ -51,7 +51,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverDummy::adapter_group_invite_member(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *group_member)
+        pEp_identity *group_member) noexcept
     {
         pEpLogClass("called");
         return PEP_STATUS_OK;
@@ -60,7 +60,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverDummy::adapter_group_remove_member(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *group_member)
+        pEp_identity *group_member) noexcept
     {
         pEpLogClass("called");
         return PEP_STATUS_OK;
diff --git a/src/grp_update_drv_dummy.hh b/src/grp_update_drv_dummy.hh
index 38dbcd8..7b2ff34 100644
--- a/src/grp_update_drv_dummy.hh
+++ b/src/grp_update_drv_dummy.hh
@@ -18,27 +18,27 @@ namespace pEp {
             PEP_SESSION session,
             pEp_identity *group_identity,
             pEp_identity *manager,
-            identity_list *memberlist) override;
+            identity_list *memberlist) noexcept override;
 
         PEP_STATUS adapter_group_join(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *as_member) override;
+            pEp_identity *as_member) noexcept override;
 
         PEP_STATUS adapter_group_dissolve(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *manager) override;
+            pEp_identity *manager) noexcept override;
 
         PEP_STATUS adapter_group_invite_member(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *group_member) override;
+            pEp_identity *group_member) noexcept override;
 
         PEP_STATUS adapter_group_remove_member(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *group_member) override;
+            pEp_identity *group_member) noexcept override;
 
         // Logging
         static bool log_enabled;
diff --git a/src/grp_update_drv_engine.cc b/src/grp_update_drv_engine.cc
index 6d2f0a9..211c6f4 100644
--- a/src/grp_update_drv_engine.cc
+++ b/src/grp_update_drv_engine.cc
@@ -12,7 +12,7 @@ namespace pEp {
         PEP_SESSION session,
         pEp_identity *group_identity,
         pEp_identity *manager,
-        identity_list *memberlist)
+        identity_list *memberlist) noexcept
     {
         pEpLogClass("called");
         return ::group_create(session, group_identity, manager, memberlist, nullptr);
@@ -21,7 +21,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverEngine::adapter_group_join(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *as_member)
+        pEp_identity *as_member) noexcept
     {
         pEpLogClass("called");
         return ::group_join(session, group_identity, as_member);
@@ -30,7 +30,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverEngine::adapter_group_dissolve(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *manager)
+        pEp_identity *manager) noexcept
     {
         pEpLogClass("called");
         return ::group_dissolve(session, group_identity, manager);
@@ -39,7 +39,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverEngine::adapter_group_invite_member(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *group_member)
+        pEp_identity *group_member) noexcept
     {
         pEpLogClass("called");
         return ::group_invite_member(session, group_identity, group_member);
@@ -48,7 +48,7 @@ namespace pEp {
     PEP_STATUS GroupUpdateDriverEngine::adapter_group_remove_member(
         PEP_SESSION session,
         pEp_identity *group_identity,
-        pEp_identity *group_member)
+        pEp_identity *group_member) noexcept
     {
         pEpLogClass("called");
         return ::group_remove_member(session, group_identity, group_member);
diff --git a/src/grp_update_drv_engine.hh b/src/grp_update_drv_engine.hh
index 4bfde72..62897f3 100644
--- a/src/grp_update_drv_engine.hh
+++ b/src/grp_update_drv_engine.hh
@@ -15,27 +15,27 @@ namespace pEp {
             PEP_SESSION session,
             pEp_identity *group_identity,
             pEp_identity *manager,
-            identity_list *memberlist) override;
+            identity_list *memberlist) noexcept override;
 
         PEP_STATUS adapter_group_join(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *as_member) override;
+            pEp_identity *as_member) noexcept override;
 
         PEP_STATUS adapter_group_dissolve(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *manager) override;
+            pEp_identity *manager) noexcept override;
 
         PEP_STATUS adapter_group_invite_member(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *group_member) override;
+            pEp_identity *group_member) noexcept override;
 
         PEP_STATUS adapter_group_remove_member(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *group_member) override;
+            pEp_identity *group_member) noexcept override;
 
         // Logging
         static bool log_enabled;
diff --git a/src/grp_update_interface.hh b/src/grp_update_interface.hh
index 7e14b3a..fac3130 100644
--- a/src/grp_update_interface.hh
+++ b/src/grp_update_interface.hh
@@ -14,27 +14,27 @@ namespace pEp {
             PEP_SESSION session,
             pEp_identity *group_identity,
             pEp_identity *manager,
-            identity_list *memberlist) = 0;
+            identity_list *memberlist) noexcept = 0;
 
         virtual PEP_STATUS adapter_group_join(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *as_member) = 0;
+            pEp_identity *as_member) noexcept = 0;
 
         virtual PEP_STATUS adapter_group_dissolve(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *manager) = 0;
+            pEp_identity *manager) noexcept = 0;
 
         virtual PEP_STATUS adapter_group_invite_member(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *group_member) = 0;
+            pEp_identity *group_member) noexcept = 0;
 
         virtual PEP_STATUS adapter_group_remove_member(
             PEP_SESSION session,
             pEp_identity *group_identity,
-            pEp_identity *group_member) = 0;
+            pEp_identity *group_member) noexcept = 0;
 
     private:
     };