diff --git a/feature-examples/build.gradle b/feature-examples/build.gradle
index 714d61d..b846260 100644
--- a/feature-examples/build.gradle
+++ b/feature-examples/build.gradle
@@ -21,6 +21,15 @@ plugins {
     id "de.undercouch.download" version "4.0.4"
 }
 
+if (project.getProperty('gemfireRepositoryUrl').contains('commercial-repo.pivotal.io')) {
+    if (!project.hasProperty("gemfireReleaseRepoUser") || gemfireReleaseRepoUser.isEmpty()) {
+        throw new GradleException("Please set gemfireReleaseRepoUser in gradle.properties to the email address you registered at https://commercial-repo.pivotal.io/")
+    }
+    if (!project.hasProperty("gemfireReleaseRepoPassword") || gemfireReleaseRepoPassword.isEmpty()) {
+        throw new GradleException("Please set gemfireReleaseRepoPassword in gradle.properties to the https://commercial-repo.pivotal.io/ password for $gemfireReleaseRepoUser")
+    }
+}
+
 allprojects {
     repositories {
         if (!gradle.usingGeodeCompositeBuild) {
@@ -47,19 +56,13 @@ allprojects {
 def installDir = System.getenv('GEMFIRE_HOME') ?: System.getenv('GEODE_HOME')
 
 task checkEnv {
-    if (installDir==null || installDir.isEmpty()) {
-        throw new GradleException("Please export GEMFIRE_HOME=<the top-level directory extracted from your GemFire .tgz> (if this message persists, you may also need to ./gradlew --stop)")
-    } else {
-        println("GemFire directory is $installDir")
-    }
-
-    if (project.getProperty('gemfireRepositoryUrl').contains('commercial-repo.pivotal.io')) {
-        if (!project.hasProperty("gemfireReleaseRepoUser") || gemfireReleaseRepoUser.isEmpty()) {
-            throw new GradleException("Please set gemfireReleaseRepoUser in gradle.properties to the email address you registered at https://commercial-repo.pivotal.io/")
-        }
-        if (!project.hasProperty("gemfireReleaseRepoPassword") || gemfireReleaseRepoPassword.isEmpty()) {
-            throw new GradleException("Please set gemfireReleaseRepoPassword in gradle.properties to the https://commercial-repo.pivotal.io/ password for $gemfireReleaseRepoUser")
+    doLast {
+        if (installDir == null || installDir.isEmpty()) {
+            throw new GradleException("Please export GEMFIRE_HOME=<the top-level directory extracted from your GemFire .tgz> (if this message persists, you may also need to ./gradlew --stop)")
+        } else {
+            println("GemFire directory is $installDir")
         }
+
     }
 }