diff --git a/src/Helpers/Build.php b/src/Helpers/Build.php
index f3061a5796d3c76c5d759f39de998d6715844af5..fd975122efd8c2b0334410e98a735a863d3ebf64 100644
--- a/src/Helpers/Build.php
+++ b/src/Helpers/Build.php
@@ -520,7 +520,7 @@
          */
         public function includeInResults($params)
         {
-            return $this->isValid($params) && $this->checkRollout();
+            return $this->isValid($params) && $this->checkRollout() && $this->getSize() > 0;
         }
 
         /**
diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php
index 4fa87802f5a0961cf333ecf8189e63b96c9ce03a..f4cdbe6d41e07db0cdfae5aae21035e480be372a 100644
--- a/src/Helpers/Builds.php
+++ b/src/Helpers/Builds.php
@@ -206,10 +206,12 @@
                         
                         if ($build->includeInResults($this->postData['params'])) {
                             array_push($this->builds, $build);
-                            if (!empty($this->postData['params']) && strcmp($this->postData['params']['source_incremental'], $build->getIncremental()) == 0) {
-                                $this->currentBuild = $build;
-                                $this->logger->info($build->getIncremental().' is the current build');
-                            }
+                        }
+                        
+                        $sourceIncremental = isset($this->postData['params']['source_incremental']) ? $this->postData['params']['source_incremental'] : NULL;
+                        if ($build->isValid($this->postData['params']) && $sourceIncremental && strcmp($sourceIncremental, $build->getIncremental()) === 0) {
+                            $this->currentBuild = $build;
+                            $this->logger->info($build->getIncremental().' is the current build');
                         }
                     }
                 }