diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java
index 14119cd851..e23018095a 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java
@@ -40,7 +40,7 @@ public class SvnLookupCommand extends AbstractSvnCommand implements LookupComman
   @Override
   public <T> Optional<T> lookup(LookupCommandRequest request) {
     try {
-      if ("propget".equalsIgnoreCase(request.getArgs()[0])) {
+      if (request.getArgs().length > 1 && "propget".equalsIgnoreCase(request.getArgs()[0])) {
         return lookupProps(request);
       }
     } catch (SVNException e) {
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java
index 827f9dfb03..bce2d48f4b 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java
@@ -156,6 +156,7 @@ public class SvnRepositoryServiceProvider extends RepositoryServiceProvider
     return new SvnModifyCommand(context, workingCopyFactory);
   }
 
+  @Override
   public LookupCommand getLookupCommand() { return new SvnLookupCommand(context);}
 
   /**