diff --git a/bin/v-move-folder-and-make-symlink b/bin/v-move-folder-and-make-symlink
index b17f6465a..6cedcbe0a 100644
--- a/bin/v-move-folder-and-make-symlink
+++ b/bin/v-move-folder-and-make-symlink
@@ -35,6 +35,16 @@ if [ ! -d "$FROMFOLDER" ]; then
     exit 1
 fi
 
+if [ -L "$FROMFOLDER" ]; then
+    echo "Folder $FROMFOLDER is already symlink, aborting"
+    exit 1
+fi
+
+if [ -d "$TOFOLDER" ]; then
+    echo "Folder $TOFOLDER already exists, aborting"
+    exit 1
+fi
+
 USER=$(stat -c '%U' "$FROMFOLDER")
 GROUP=$(stat -c '%G' "$FROMFOLDER")
 PARENTFOLDER=$(dirname "$TOFOLDER")