diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
index a98ce7d90e..e657c3c908 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
@@ -230,8 +230,15 @@ public class RepositoryResource
         ChangesetPagingResult changesets = changesetViewer.getChangesets(start,
                                              limit);
 
-        callPreProcessors(changesets);
-        response = Response.ok(changesets).build();
+        if (changesets != null)
+        {
+          callPreProcessors(changesets);
+          response = Response.ok(changesets).build();
+        }
+        else
+        {
+          response = Response.ok().build();
+        }
       }
       else
       {