diff --git a/planex/cmd/clone.py b/planex/cmd/clone.py
index fd7441e7..92004923 100755
--- a/planex/cmd/clone.py
+++ b/planex/cmd/clone.py
@@ -149,6 +149,9 @@ def clone(url, destination, commitish):
 
     if not destination.parent.exists():
         destination.parent.mkdir(parents=True)
+    if destination.exists():
+        # Take a fresh clone if we are re-cloning
+        shutil.rmtree(str(destination))
 
     repo = git.Repo.clone_from(url, str(destination))
     if commitish in repo.remotes['origin'].refs:
@@ -191,7 +194,7 @@ def extract(url_str, destination):
     archive_file = None
 
     # pylint: disable=no-member
-    destination.mkdir(parents=True)
+    destination.mkdir(parents=True, exist_ok=True)
     repo = git.Repo.init(str(destination))
 
     logging.debug("Extracting %s to new git repo", url_str)
@@ -216,9 +219,10 @@ def extract(url_str, destination):
         fetch_url(url, archive_path, 5)
 
     # extract the archive
-    tara = tarfile.open(archive_path)
-    tara.extractall(str(destination))
-    tara.close()
+    if tarfile.is_tarfile(archive_path):
+        tara = tarfile.open(archive_path)
+        tara.extractall(str(destination))
+        tara.close()
 
     if archive_file:
         # delete temp file
diff --git a/setup.py b/setup.py
index d195fc09..2eee19b2 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup
 
 setup(name='planex',
-      version='4.1.2',
+      version='4.1.3',
       packages=['planex', 'planex.cmd'],
       package_data={'planex': ['Makefile.rules']},
       entry_points={