diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
index bf6801c0e3..4bf46f495c 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/App.java
@@ -155,8 +155,18 @@ public class App
         session = createSession();
       }
 
-      subcommand.init(input, output, i18n, session);
-      subcommand.run(arguments);
+      try
+      {
+        subcommand.init(input, output, i18n, session);
+        subcommand.run(arguments);
+      }
+      finally
+      {
+        if (session != null)
+        {
+          session.close();
+        }
+      }
     }
   }
 
@@ -222,7 +232,6 @@ public class App
   @Argument(
     index = 0,
     metaVar = "metaVar_command",
-    required = true,
     handler = SubCommandHandler.class
   )
   private SubCommand subcommand;
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/CommandDescriptor.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/CommandDescriptor.java
index ce2be616b3..148c8c18eb 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/CommandDescriptor.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/CommandDescriptor.java
@@ -63,6 +63,7 @@ public class CommandDescriptor
   public CommandDescriptor(Class<? extends SubCommand> commandClass)
   {
     AssertUtil.assertIsNotNull(commandClass);
+    this.commandClass = commandClass;
 
     Command cmd = commandClass.getAnnotation(Command.class);
 
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java
new file mode 100644
index 0000000000..3cd459f762
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.cli;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Command("list-repositories")
+public class ListRepositoriesSubCommand extends SubCommand
+{
+
+  /**
+   * Method description
+   *
+   */
+  @Override
+  protected void run()
+  {
+    output.println( "list-repositoies" );
+  }
+}
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java
index 7fd15b66be..2c74b90c08 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommandHandler.java
@@ -46,6 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.util.IOUtil;
+import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -134,7 +135,7 @@ public class SubCommandHandler extends OptionHandler<SubCommand>
   @Override
   public String getDefaultMetaVariable()
   {
-    throw new UnsupportedOperationException("Not supported yet.");
+    return "metaVar_command";
   }
 
   //~--- methods --------------------------------------------------------------
@@ -181,7 +182,7 @@ public class SubCommandHandler extends OptionHandler<SubCommand>
   {
     line = line.trim();
 
-    if (!line.startsWith("#"))
+    if (Util.isNotEmpty(line) &&!line.startsWith("#"))
     {
       try
       {
diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand
index b89f4c91f3..7559544a31 100644
--- a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand
+++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand
@@ -25,4 +25,6 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # 
 # http://bitbucket.org/sdorra/scm-manager
-# 
\ No newline at end of file
+# 
+
+sonia.scm.cli.ListRepositoriesSubCommand
\ No newline at end of file