diff --git a/src/freedombone b/src/freedombone
index 629ff592..eea38c5c 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -948,17 +948,19 @@ function parse_args {
 }
 
 function read_repo_servers {
-    if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
-        MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+    if [ -f $CONFIGURATION_FILE ]; then
+        if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+            MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
     fi
 
     if [ ! $FRIENDS_TROVE_SERVER ]; then
diff --git a/src/freedombone-addcert b/src/freedombone-addcert
index f5e1185d..4b48ceba 100755
--- a/src/freedombone-addcert
+++ b/src/freedombone-addcert
@@ -56,17 +56,19 @@ FRIENDS_TROVE_SSH_PORT=
 MY_TROVE_PASSWORD=
 
 function read_repo_servers {
-    if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
-        MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+    if [ -f $CONFIGURATION_FILE ]; then
+        if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+            MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
     fi
 
     if [ ! $FRIENDS_TROVE_SERVER ]; then
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index c60a14a3..dcdab573 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -43,17 +43,19 @@ FRIENDS_TROVE_PASSWORD=
 MY_TROVE_PASSWORD=
 
 function read_repo_servers {
-    if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
-        MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
-        FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+    if [ -f $CONFIGURATION_FILE ]; then
+        if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+            MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
+        if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+            FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+        fi
     fi
 
     if [ ! $FRIENDS_TROVE_SERVER ]; then