diff --git a/src/freedombone b/src/freedombone
index 981da4ff..cff831d6 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -3424,6 +3424,10 @@ function initial_setup {
     apt-get -y install cryptsetup libgfshare-bin obnam sshpass wget
     apt-get -y install avahi-daemon avahi-utils avahi-discover
 
+    if [ ! -d $INSTALL_DIR ]; then
+        mkdir -p $INSTALL_DIR
+    fi
+
     echo 'initial_setup' >> $COMPLETION_FILE
 }
 
@@ -4286,6 +4290,9 @@ function configure_email {
     echo '        # cannot use TLS otherwise it will EHLO again!!' >> /etc/exim4/conf.d/transport/100_smtorp
     echo '        hosts_avoid_tls = *' >> /etc/exim4/conf.d/transport/100_smtorp
 
+    if [ ! -d $INSTALL_DIR ]; then
+        mkdir -p $INSTALL_DIR
+    fi
     cd $INSTALL_DIR
     git clone $EXIM_ONION_REPO
     cd $INSTALL_DIR/exim4-smtorp/tor-smtp