diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmMacDistributionCustomizer.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmMacDistributionCustomizer.groovy
index 90d8738c5d47..0f687d39d716 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmMacDistributionCustomizer.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmMacDistributionCustomizer.groovy
@@ -25,8 +25,10 @@ import org.jetbrains.intellij.build.MacDistributionCustomizer
 class PyCharmMacDistributionCustomizer extends MacDistributionCustomizer {
   @Override
   void copyAdditionalFiles(BuildContext context, String targetDirectory) {
-    context.ant.copy(todir: "$targetDirectory/skeletons") {
-      fileset(dir: "$context.paths.projectHome/skeletons") {
+    def underTeamCity = System.getProperty("teamcity.buildType.id") != null
+
+    context.ant.copy(todir: "$targetDirectory/skeletons", failonerror: underTeamCity) {
+      fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: underTeamCity) {
         include(name: "skeletons-mac*.zip")
       }
     }
diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy
index 141c4d8d9f0a..0d8ef70b1167 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy
@@ -45,8 +45,10 @@ abstract class PyCharmPropertiesBase extends ProductProperties {
 
     new PyPrebuiltIndicesGenerator().generateResources(context)
 
-    context.ant.copy(todir: "$targetDirectory/index", failonerror: true) {
-      fileset(dir: "$context.paths.temp/index", erroronmissingdir: true) {
+    def underTeamCity = System.getProperty("teamcity.buildType.id") != null
+
+    context.ant.copy(todir: "$targetDirectory/index", failonerror: underTeamCity) {
+      fileset(dir: "$context.paths.temp/index", erroronmissingdir: underTeamCity) {
         include(name: "**")
       }
     }
@@ -66,11 +68,13 @@ class PyPrebuiltIndicesGenerator implements ResourcesGenerator {
 
     def zipPath = "$context.paths.temp/zips"
 
-    context.ant.copy(todir: "$zipPath", failonerror: true) {
-      fileset(dir: "$context.paths.projectHome/python-distributions", erroronmissingdir: true) {
+    def underTeamCity = System.getProperty("teamcity.buildType.id") != null
+
+    context.ant.copy(todir: "$zipPath", failonerror: underTeamCity) {
+      fileset(dir: "$context.paths.projectHome/python-distributions", erroronmissingdir: underTeamCity) {
         include(name: "*.zip")
       }
-      fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: true) {
+      fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: underTeamCity) {
         include(name: "*.zip")
       }
     }
diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmWindowsDistributionCustomizer.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmWindowsDistributionCustomizer.groovy
index 62d354ddfe55..e5ff0b555949 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmWindowsDistributionCustomizer.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmWindowsDistributionCustomizer.groovy
@@ -24,8 +24,10 @@ import org.jetbrains.intellij.build.WindowsDistributionCustomizer
 class PyCharmWindowsDistributionCustomizer extends WindowsDistributionCustomizer {
   @Override
   void copyAdditionalFiles(BuildContext context, String targetDirectory) {
-    context.ant.copy(todir: "$targetDirectory/skeletons") {
-      fileset(dir: "$context.paths.projectHome/skeletons") {
+    def underTeamCity = System.getProperty("teamcity.buildType.id") != null
+
+    context.ant.copy(todir: "$targetDirectory/skeletons", failonerror: underTeamCity) {
+      fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: underTeamCity) {
         include(name: "skeletons-win*.zip")
       }
     }