diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb
index f81e95e0402..6d8cee3c87d 100644
--- a/lib/theme_store/git_importer.rb
+++ b/lib/theme_store/git_importer.rb
@@ -44,7 +44,7 @@ class ThemeStore::GitImporter
       return Discourse::Utils.execute_command("git", "diff", "--staged")
     end
   ensure
-    FileUtils.rm_rf local_temp_folder
+    FileUtils.rm_rf local_temp_folder if local_temp_folder
   end
 
   def commits_since(hash)