diff --git a/bootstrap/createDatabase.sh b/bootstrap/createDatabase.sh
index 8debd549bb56c3c7d0c82d9ee9448eb723f5825c..7d42c0b03b3db05c629a8ae0bce0251888d94b0e 100755
--- a/bootstrap/createDatabase.sh
+++ b/bootstrap/createDatabase.sh
@@ -38,6 +38,9 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 
 START=$(date +%s)
 
+mkdir -p $WORKING_DIR
+cd $WORKING_DIR
+
 if $AVAILABLE_POSTGRES; then
 	echo "Creating postgresql database \"$PG_DB_NAME\""
 	sudo -u "postgres" ${EXEC_POSTGRES} -d template1 -c "CREATE DATABASE \"$PG_DB_NAME\";" >> $WORKING_DIR/setup_database.log 2>&1
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index 6a00250c87a122381c97777b659e33a617f87072..2ced5149707d16c5432cf7429544b71a1bc13911 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -137,6 +137,10 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 
 START=$(date +%s)
 
+mkdir -p $DOWNLOAD_DIR
+mkdir -p $WORKING_DIR
+cd $WORKING_DIR
+
 # Import real world datasets
 fn_import_data "Bozen" "$OSM_FILE_ITALY" "$OSM_FILE_BZ_FILTERED" "$OSM_BBOX_BZ" "bz_export.sql.gz" "$TABLE_PREFIX_BZ"
 fn_import_data "Innsbruck" "$OSM_FILE_AUSTRIA" "$OSM_FILE_IBK_FILTERED" "$OSM_BBOX_IBK" "" "$TABLE_PREFIX_IBK"