diff --git a/src/freedombone-utils-git b/src/freedombone-utils-git
index 4c320d91..6ede5d50 100755
--- a/src/freedombone-utils-git
+++ b/src/freedombone-utils-git
@@ -33,16 +33,13 @@ function git_clone {
     destination_dir="$2"
 
     if [[ "$repo_url" == 'ssh:'* ]]; then
-        retval=$(get_friends_servers)
-        if [[ $retval == "0" ]]; then
-            if [ "${FRIENDS_MIRRORS_SERVER}" ]; then
-                if [ ${#FRIENDS_MIRRORS_SERVER} -gt 2 ]; then
-                    if [ "$FRIENDS_MIRRORS_PASSWORD" ]; then
-                        if [ ${#FRIENDS_MIRRORS_PASSWORD} -gt 2 ]; then
-                            echo "sshpass -p \"$FRIENDS_MIRRORS_PASSWORD\" git clone $repo_url $destination_dir"
-                            sshpass -p "$FRIENDS_MIRRORS_PASSWORD" git clone "$repo_url" "$destination_dir"
-                            return
-                        fi
+        if [ "${FRIENDS_MIRRORS_SERVER}" ]; then
+            if [ ${#FRIENDS_MIRRORS_SERVER} -gt 2 ]; then
+                if [ "$FRIENDS_MIRRORS_PASSWORD" ]; then
+                    if [ ${#FRIENDS_MIRRORS_PASSWORD} -gt 2 ]; then
+                        echo "sshpass -p \"$FRIENDS_MIRRORS_PASSWORD\" git clone $repo_url $destination_dir"
+                        sshpass -p "$FRIENDS_MIRRORS_PASSWORD" git clone "$repo_url" "$destination_dir"
+                        return
                     fi
                 fi
             fi
@@ -60,7 +57,6 @@ function git_pull {
     git stash
     git remote set-url origin $1
     git checkout master
-    retval=$(get_friends_servers)
     if [ "${FRIENDS_MIRRORS_SERVER}" ]; then
         if [ ${#FRIENDS_MIRRORS_SERVER} -gt 2 ]; then
             if [ "$FRIENDS_MIRRORS_PASSWORD" ]; then