diff --git a/app/build.gradle b/app/build.gradle
index f4f4ca7add..676c9b6287 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,6 +70,26 @@ def generateDate = { ->
     return stringBuilder.toString()
 }
 
+def isMaster = { ->
+    return !version.contains('-')
+}
+
+def allCommited = { ->
+    StringBuilder stringBuilder = new StringBuilder();
+    try {
+        def stdout = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'status'
+            standardOutput = stdout
+        }
+        String commitObject = stdout.toString().trim()
+        stringBuilder.append(commitObject)
+    } catch (ignored) {
+        return false; // NoGitSystemAvailable
+    }
+    return stringBuilder.toString().contains("nothing to commit")
+}
+
 tasks.matching { it instanceof Test }.all {
     testLogging.events = ["failed", "skipped", "started"]
     testLogging.exceptionFormat = "full"
@@ -86,7 +106,7 @@ android {
         version "2.3"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
-        buildConfigField "String", "REMOTE", '"' + generateGitRemote()+ '"'
+        buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
         buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         // if you change minSdkVersion to less than 11, you need to change executeTask for wear
@@ -126,7 +146,7 @@ android {
             resValue "string", "app_name", "AndroidAPS"
             versionName version
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher",
+                    appIcon     : "@mipmap/ic_launcher",
                     appIconRound: "@mipmap/ic_launcher_round"
             ]
         }
@@ -136,7 +156,7 @@ android {
             resValue "string", "app_name", "Pumpcontrol"
             versionName version + "-pumpcontrol"
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_pumpcontrol",
+                    appIcon     : "@mipmap/ic_pumpcontrol",
                     appIconRound: "@null"
             ]
         }
@@ -146,7 +166,7 @@ android {
             resValue "string", "app_name", "NSClient"
             versionName version + "-nsclient"
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_yellowowl",
+                    appIcon     : "@mipmap/ic_yellowowl",
                     appIconRound: "@null"
             ]
         }
@@ -156,7 +176,7 @@ android {
             resValue "string", "app_name", "NSClient2"
             versionName version + "-nsclient"
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_yellowowl",
+                    appIcon     : "@mipmap/ic_yellowowl",
                     appIconRound: "@null"
             ]
         }
@@ -171,7 +191,7 @@ android {
         unitTests.includeAndroidResources = true
     }
 
-    useLibrary  "org.apache.http.legacy"
+    useLibrary "org.apache.http.legacy"
 }
 
 allprojects {
@@ -281,3 +301,12 @@ task full_clean(type: Delete) {
 
 clean.dependsOn full_clean
 preBuild.dependsOn copyLibs
+
+printf('--------------\n')
+printf('isMaster: %s\n', isMaster().toString())
+printf('allCommited: %s\n', allCommited().toString())
+printf('--------------\n')
+if (isMaster() && !allCommited()) {
+    throw new GradleException('There are uncommitted changes or git system is not available. Clone sources again as described in wiki and do not allow gradle update')
+}
+