diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index a3e9007..6e04081 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -99,10 +99,10 @@
       echo "***** FAST FAILURE *****\n\nFast failure triggered by ${taskContext.failingFast}\n\n***** FAST FAILURE *****"
     }
     stage("Notifications") {
-      def isFirstBuild = currentBuild == null || currentBuild.changeSets == null
-	  def authors = isFirstBuild ? [] : currentBuild.changeSets.last().toList().collect { it.author.toString() }.unique()
+	  def changes = currentBuild?.changeSets
+	  def authors = !changes || changes.isEmpty() ? [] : currentBuild.changeSets.last().toList().collect { it.author.toString() }.unique()
 	  println("The author of the last change: ${authors}")
-	  if (isFirstBuild || !authors.contains('github')) jenkinsNotify()
+	  if (!changes || !authors.contains('github')) jenkinsNotify()
     }
   }
 }
diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index d906adf..6288337 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -179,10 +179,10 @@
       echo "***** FAST FAILURE *****\n\nFast failure triggered by ${failingFast}\n\n***** FAST FAILURE *****"
     }
     stage("Notifications") {
-      def isFirstBuild = currentBuild == null || currentBuild.changeSets == null
-	  def authors = isFirstBuild ? [] : currentBuild.changeSets.last().toList().collect { it.author.toString() }.unique()
+	  def changes = currentBuild?.changeSets
+	  def authors = !changes || changes.isEmpty() ? [] : currentBuild.changeSets.last().toList().collect { it.author.toString() }.unique()
 	  println("The author of the last change: ${authors}")
-	  if (isFirstBuild || !authors.contains('github')) jenkinsNotify()
+	  if (!changes || !authors.contains('github')) jenkinsNotify()
     }
   }
 }