diff --git a/handlers/rdiff.helper.in b/handlers/rdiff.helper.in
index a282949..56d8673 100644
--- a/handlers/rdiff.helper.in
+++ b/handlers/rdiff.helper.in
@@ -164,17 +164,10 @@ do_rdiff_ssh_con() {
       [ $? = 0 ] || return
    fi
 
-   ssh_create_root_key "$rdiff_title" "$rdiff_host" "$rdiff_user"
-   if [ "$?" != "0" ]; then
-      # key setup failed, can't go further
-      return
-   fi
+   # if key setup fails, can't go further
+   ssh_create_root_key "$rdiff_title" "$rdiff_host" "$rdiff_user" || return
 
-   ssh_ensure_remote_dir "$rdiff_title" "$rdiff_directory" "$rdiff_host" "$rdiff_user"
-   if [ "$?" != "0" ]; then
-      # couldn't ensure that remote dir is created and accessible, can't go further
-      return
-   fi
+   ssh_ensure_remote_dir "$rdiff_title" "$rdiff_directory" "$rdiff_host" "$rdiff_user" || return
 
    do_rdiff_con
 }
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 24f212e..ed73cf8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,9 +1,9 @@
 my_execbindir = $(pkglibdir)
-my_execbin_SCRIPTS = easydialog parseini tools vserver ssh
+my_execbin_SCRIPTS = easydialog parseini tools ssh vserver
 
 CLEANFILES = $(my_execbin_SCRIPTS)
 
-EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in ssh.in
+EXTRA_DIST = easydialog.in parseini.in tools.in ssh.in vserver.in
 
 edit = sed \
     -e "s,@CFGDIR\@,$(CFGDIR),g" \
@@ -25,10 +25,10 @@ tools: $(srcdir)/tools.in
 	rm -f tools
 	$(edit) tools.in > tools
 
-vserver: $(srcdir)/vserver.in
-	rm -f vserver
-	$(edit) vserver.in > vserver
-
 ssh: $(srcdir)/ssh.in
 	rm -f ssh
 	$(edit) ssh.in > ssh
+
+vserver: $(srcdir)/vserver.in
+	rm -f vserver
+	$(edit) vserver.in > vserver
diff --git a/src/backupninja.in b/src/backupninja.in
index d771eae..b6ab6b8 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -473,8 +473,8 @@ fi
 
 # include shared functions
 . $libdirectory/tools
-. $libdirectory/vserver
 . $libdirectory/ssh
+. $libdirectory/vserver
 
 setfile $conffile
 
diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index bbe06e6..b2cc237 100755
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -202,8 +202,8 @@ fi
 # include shared functions
 . $libdirectory/easydialog
 . $libdirectory/tools
-. $libdirectory/vserver
 . $libdirectory/ssh
+. $libdirectory/vserver
 
 # am I running as root?
 if [ "$UID" != "0" ]; then