Minor clean up

Author: pontusmelke

cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java

@@ -221,11 +221,12 @@ else if ( systemBookmark != null )
         session = driver.session( builder.build() );
 
         resetActualDbName(); // Set this to null first in case run throws an exception
-        wrap(command).apply();
+        connect(command);
     }
 
-    private ThrowingAction<CommandException> wrap(ThrowingAction<CommandException> command) {
-        return command == null ? getPing() : () ->
+    private void connect( ThrowingAction<CommandException> command) throws CommandException
+    {
+        ThrowingAction<CommandException> toCall = command == null ? getPing() : () ->
         {
             try
             {
@@ -242,6 +243,9 @@ private ThrowingAction<CommandException> wrap(ThrowingAction<CommandException> c
                 throw e;
             }
         };
+
+        //execute
+        toCall.apply();
     }
 
     private ThrowingAction<CommandException> getPing() {