diff --git a/.circleci/config.yml b/.circleci/config.yml
index b7b835f..1fdd3c3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,6 +32,7 @@ commands:
       - run: echo "export SLUG=$(grep '@package' /tmp/src/plugin.php | awk -F ' ' '{print $3}' | sed 's/^\s//')" >> ${BASH_ENV}
       - run: svn co https://plugins.svn.wordpress.org/${SLUG} --depth=empty .
       - run: svn up trunk
+      - run: svn up tags --depth=empty
       - run: find ./trunk -not -path "./trunk" -delete
       - run: cp -r /tmp/src/. ./trunk
       - run: svn propset svn:ignore -F ./trunk/.svnignore ./trunk
@@ -39,14 +40,14 @@ commands:
   svn_add_changes:
     description: "Add changes to SVN"
     steps:
-      - run: svn st | grep ^! | awk '{print " --force "$2}' | xargs svn rm &>/dev/null
+      - run:
+          command: if [[ ! -z $(svn st | grep ^\!) ]]; then svn st | grep ^! | awk '{print " --force "$2}' | xargs -0r svn rm; fi
       - run: svn add --force .
 
   svn_create_tag:
     description: "Create a SVN tag"
     steps:
       - set_verision_variable
-      - run: svn up tags --depth=empty
       - run: svn cp trunk tags/${VERSION}
 
   svn_commit:
@@ -102,8 +103,8 @@ jobs:
       - attach_workspace:
           at: /tmp
       - svn_setup
-      - svn_add_changes
       - svn_create_tag
+      - svn_add_changes
       - svn_commit
 
 workflows: