diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index 7f479c4b89..d8d5405ad4 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -88,6 +88,9 @@ public class UserCollectionResource extends AbstractManagerResource<User, UserEx
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   public Response create(@Context UriInfo uriInfo, UserDto userDto) throws IOException, UserException {
+    if (userDto == null) {
+      return Response.status(400).build();
+    }
     User user = dtoToUserMapper.map(userDto, "");
     manager.create(user);
     return Response.created(URI.create(user(uriInfo).self(user.getName()))).build();
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
index d6560de8bb..fd6ac8ff53 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
@@ -39,7 +39,7 @@ public class GroupCollectionToDtoMapperTest {
 
   @Before
   public void init() throws URISyntaxException {
-//    uriInfoStore.set(uriInfo);
+    uriInfoStore.set(uriInfo);
     URI baseUri = new URI("http://example.com/base/");
     expectedBaseUri = baseUri.resolve(GroupV2Resource.GROUPS_PATH_V2 + "/");
     when(uriInfo.getBaseUri()).thenReturn(baseUri);