diff --git a/bin/commands/create-project b/bin/commands/create-project
index 30775d3..79c78d2 100644
--- a/bin/commands/create-project
+++ b/bin/commands/create-project
@@ -59,49 +59,26 @@ echoMainTitle "Create project"
 echo
 echoSubTitle "Please verify data"
 echo
-echo "Project Path: $workspaces_dir/$customer/$project"
-echo "Project Data Path: $project_manager_dir/data/$customer/$project"
+echo "Project path: $workspaces_dir/$customer/$project"
+echo "Project data path: $project_manager_dir/data/$customer/$project"
 echo
 confirm
 
-projects_string='';
-for i in "${!projects[@]}"
-do
-  ((nr=i+1))
-  projects_string+="$(echo -e "\n\t\"${projects[$i]}\" # $nr")"
-done
-((nr=nr+1))
-projects_string+="$(echo -e "\n\t\"$project\" # $nr")"
-
-shortnames_string='';
-for i in "${!shortnames[@]}"
-do
-  ((nr=i+1))
-  shortnames_string+="$(echo -e "\n\t\"${shortnames[$i]}\" # $nr")"
-done
-((nr=nr+1))
-shortnames_string+="$(echo -e "\n\t\"$shortname\" # $nr")"
-
-customers_string='';
-for i in "${!customers[@]}"
-do
-  ((nr=i+1))
-  customers_string+="$(echo -e "\n\t\"${customers[$i]}\" # $nr")"
-done
-((nr=nr+1))
-customers_string+="$(echo -e "\n\t\"$customer\" # $nr")"
-
-cat <<- EOF > "$project_manager_dir/etc/projects"
-#!/bin/bash
-
-projects=($projects_string
-)
-shortnames=($shortnames_string
-)
-customers=($customers_string
-)
+if [ -d "$project_manager_dir/data/$customer/$project" ] || [ -d "$project_manager_dir/data/$customer/$project" ]
+then
+  echo
+  echoError "Data path already exists"
+  echo
+  exit
+fi
 
-EOF
+if [ -d "$workspaces_dir/$customer/$project" ] || [ -d "$workspaces_dir/$customer/$project" ]
+then
+  echo
+  echoError "Path already exists"
+  echo
+  exit
+fi
 
 path="$project_manager_dir/data/$customer/$project"
 
@@ -148,6 +125,45 @@ done
 
 if [ ! -d "$workspaces_dir/$customer/$project" ]; then mkdir -p "$workspaces_dir/$customer/$project"; fi
 
+projects_string='';
+for i in "${!projects[@]}"
+do
+  ((nr=i+1))
+  projects_string+="$(echo -e "\n\t\"${projects[$i]}\" # $nr")"
+done
+((nr=nr+1))
+projects_string+="$(echo -e "\n\t\"$project\" # $nr")"
+
+shortnames_string='';
+for i in "${!shortnames[@]}"
+do
+  ((nr=i+1))
+  shortnames_string+="$(echo -e "\n\t\"${shortnames[$i]}\" # $nr")"
+done
+((nr=nr+1))
+shortnames_string+="$(echo -e "\n\t\"$shortname\" # $nr")"
+
+customers_string='';
+for i in "${!customers[@]}"
+do
+  ((nr=i+1))
+  customers_string+="$(echo -e "\n\t\"${customers[$i]}\" # $nr")"
+done
+((nr=nr+1))
+customers_string+="$(echo -e "\n\t\"$customer\" # $nr")"
+
+cat <<- EOF > "$project_manager_dir/etc/projects"
+#!/bin/bash
+
+projects=($projects_string
+)
+shortnames=($shortnames_string
+)
+customers=($customers_string
+)
+
+EOF
+
 echo
 echoSubTitle "Running postscripts ..."
 postScript "$path/bin/postscripts/commands/create-project"
diff --git a/bin/commands/remove-project b/bin/commands/remove-project
index cb3e4fe..5c98b48 100644
--- a/bin/commands/remove-project
+++ b/bin/commands/remove-project
@@ -56,6 +56,28 @@ echo "Project Data Path: $project_manager_dir/data/$customer/$project"
 echo
 confirm
 
+echo
+echo "Moving files to trash"
+
+customer_dir_list=($(ls -t "$project_manager_dir/data/$customer"))
+has_more_dirs=$(if [ "${#customer_dir_list[@]}" -gt 1 ]; then echo true; else echo false; fi)
+
+rand=$(cat /proc/sys/kernel/random/uuid)
+trash_path="$project_manager_dir/.trash/$rand"
+mkdir "$trash_path"
+mkdir "$trash_path/data"
+mkdir "$trash_path/workspace"
+mkdir "$trash_path/data/$customer"
+mkdir "$trash_path/workspace/$customer"
+mv "$project_manager_dir/data/$customer/$project" "$trash_path/data/$customer/$project"
+mv "$workspaces_dir/$customer/$project" "$trash_path/workspace/$customer/$project"
+
+if [ "$has_more_dirs" != true ]
+then
+  rmdir "$project_manager_dir/data/$customer"
+  rmdir "$workspaces_dir/$customer"
+fi
+
 nr=0
 projects_string='';
 for i in "${!projects[@]}"
@@ -101,28 +123,6 @@ customers=($customers_string
 
 EOF
 
-echo
-echo "Moving files to trash"
-
-customer_dir_list=($(ls -t "$project_manager_dir/data/$customer"))
-has_more_dirs=$(if [ "${#customer_dir_list[@]}" -gt 1 ]; then echo true; else echo false; fi)
-
-rand=$(cat /proc/sys/kernel/random/uuid)
-trash_path="$project_manager_dir/.trash/$rand"
-mkdir "$trash_path"
-mkdir "$trash_path/data"
-mkdir "$trash_path/workspace"
-mkdir "$trash_path/data/$customer"
-mkdir "$trash_path/workspace/$customer"
-mv "$project_manager_dir/data/$customer/$project" "$trash_path/data/$customer/$project"
-mv "$workspaces_dir/$customer/$project" "$trash_path/workspace/$customer/$project"
-
-if [ "$has_more_dirs" != true ]
-then
-  rmdir "$project_manager_dir/data/$customer"
-  rmdir "$workspaces_dir/$customer"
-fi
-
 echo
 echoSubTitle "Running postscripts ..."
 postScript "$path/bin/postscripts/commands/remove-project"
diff --git a/plugins/git/commands/clone b/plugins/git/commands/clone
index d94b876..4858d02 100644
--- a/plugins/git/commands/clone
+++ b/plugins/git/commands/clone
@@ -42,14 +42,14 @@ echo "GIT User: $git_ssh_user"
 echo "GIT Domain: $git_ssh_domain"
 echo "Install Location: $workspaces_dir/$customer/$project"
 echo
-confirm="$(readConsole "Should i execute [y,n]:" "Invalid selection" "y n")"
+confirm
 
-if [ "$confirm" == "n" ]
+if [ ! -d "$workspaces_dir/$customer/$project" ]
 then
   echo
-  echoError "Aborting"
+  echoError "Wprkspace dir not exists"
   echo
-  exit;
+  exit
 fi
 
 sshAddKey "git"