diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCreationDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCreationDto.java
index 4606ce3060..05dedab873 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCreationDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCreationDto.java
@@ -29,6 +29,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.Collections;
 import java.util.Map;
 
 @NoArgsConstructor
@@ -36,4 +37,11 @@ import java.util.Map;
 @Setter
 public class RepositoryCreationDto extends RepositoryDto {
   private Map<String, JsonNode> creationContext;
+
+  public Map<String, JsonNode> getCreationContext() {
+    if (creationContext == null) {
+      return Collections.emptyMap();
+    }
+    return creationContext;
+  }
 }