diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
index e90bdd75ffb6a3c66f88d66ba165905f357842df..8a8bfe61d39581417f54e39553e4a5f296ddb89b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
@@ -123,7 +123,7 @@ public class ServiceGroupService {
 
         if (!newOwner.isPresent()) {
             LOG.error("The owner [{}] does not exist! Save service group is rejected!", ownerName);
-            SMPRuntimeException ex = new SMPRuntimeException(INVALID_OWNER);
+            SMPRuntimeException ex = new SMPRuntimeException(INVALID_OWNER, ownerName);
             LOG.businessError(SMPMessageCode.BUS_SAVE_SERVICE_GROUP_FAILED, domain, normalizedParticipantId.getValue(), normalizedParticipantId.getScheme(), ex.getMessage());
             throw ex;
         }
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceSingleDomainIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceSingleDomainIntegrationTest.java
index 5c61019cf9c16f74d489bac760e41026618520fd..77a6810679d18fdbb8cc122f9f29c7345a71a345 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceSingleDomainIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceSingleDomainIntegrationTest.java
@@ -248,7 +248,7 @@ public class ServiceGroupServiceSingleDomainIntegrationTest extends AbstractServ
         //then
         expectedExeption.expect(SMPRuntimeException.class);
         // get by null domain so: (all registered domains)
-        expectedExeption.expectMessage(USER_NOT_EXISTS.getMessage());
+        expectedExeption.expectMessage(INVALID_OWNER.getMessage(TestConstants.USER_CERT_3));
 
         // when
         testInstance.saveServiceGroup(inServiceGroup, null,