diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java
index a70a7b630..f5ec7fe10 100644
--- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java
+++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/Group.java
@@ -60,8 +60,8 @@ public class Group extends Model {
 	}
 
 	public void setDescription(String description) {
-		if (Strings.isNullOrEmpty(description)) {
-			throw new IllegalArgumentException("description cannot be null nor empty");
+		if (null == description) {
+			throw new IllegalArgumentException("description cannot be null");
 		}
 
 		this.description = description;
diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java
index 9375a2fdf..c10ce43a6 100644
--- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java
+++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/models/mappers/RpcMapper.java
@@ -114,7 +114,7 @@ public class RpcMapper {
 
 		Long id = getRequiredFieldAsLong(json, ID);
 		Long parentGroupId = getFieldAsLong(json, PARENT_GROUP_ID);
-		String name = getRequiredFieldAsString(json, NAME);
+		String name = getFieldAsString(json, NAME);
 		String description = getFieldAsString(json, DESCRIPTION);
 		Long voId = getRequiredFieldAsLong(json, VO_ID);
 		String uuid = getRequiredFieldAsString(json, UUID);
diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java
index ce81b2598..c078e594f 100644
--- a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java
+++ b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/adapters/impl/PerunAdapterLdap.java
@@ -557,15 +557,18 @@ public class PerunAdapterLdap extends PerunAdapterWithMappingServices implements
 					PERUN_VO_ID, PERUN_PARENT_GROUP_ID, UUID};
 
 			EntryMapper<Group> mapper = e -> {
-				if (!checkHasAttributes(e, new String[]{
-						PERUN_GROUP_ID, CN, DESCRIPTION, PERUN_UNIQUE_GROUP_NAME, PERUN_VO_ID, UUID }))
+				if (!checkHasAttributes(e,
+						new String[]{ PERUN_GROUP_ID, CN, PERUN_UNIQUE_GROUP_NAME, PERUN_VO_ID, UUID }))
 				{
 					return null;
 				}
 
 				Long id = Long.valueOf(e.get(PERUN_GROUP_ID).getString());
 				String name = e.get(CN).getString();
-				String description = e.get(DESCRIPTION).getString();
+				String description = "";
+				if (e.containsAttribute(DESCRIPTION)) {
+					description = e.get(DESCRIPTION).getString();
+				}
 				String uniqueName = e.get(PERUN_UNIQUE_GROUP_NAME).getString();
 				Long voId = Long.valueOf(e.get(PERUN_VO_ID).getString());
 				Long parentGroupId = null;