diff --git a/scripts/Common/Scripts/BrowserAutomation.ps1 b/scripts/Common/Scripts/BrowserAutomation.ps1
index a7192153..5d04825c 100644
--- a/scripts/Common/Scripts/BrowserAutomation.ps1
+++ b/scripts/Common/Scripts/BrowserAutomation.ps1
@@ -90,18 +90,24 @@ $null = New-Module {
     
             $browser = [OpenQA.Selenium.Firefox.FirefoxDriver]::new($options);
             $browser.Navigate().GoToUrl($URL);
-            $null = & $downloadAction -Browser $browser;
-    
-            while (& $downloadChecker) {
-                Write-Host "Waiting for the download to finish…";
-                Start-Sleep 1;
+
+            try {
+                $null = & $downloadAction -Browser $browser;
+        
+                while (& $downloadChecker) {
+                    Write-Host "Waiting for the download to finish…";
+                    Start-Sleep 1;
+                }
+        
+                $file = Get-ChildItem $dir;
+                $result = Move-Item $file $OutDir -PassThru;
+                $browser.Quit();
+                Remove-Item -Recurse $dir;
+                $result;
+            }
+            catch {
+                throw $Error;
             }
-    
-            $file = Get-ChildItem $dir;
-            $result = Move-Item $file $OutDir -PassThru;
-            $browser.Quit();
-            Remove-Item -Recurse $dir;
-            $result;
         }
     }
 
@@ -130,7 +136,24 @@ $null = New-Module {
                 [OpenQA.Selenium.Firefox.FirefoxDriver] $Browser
             )
 
-            $Browser.FindElement([OpenQA.Selenium.By]::CssSelector($ButtonSelector)).Click();
+            $selector = [OpenQA.Selenium.By]::CssSelector($ButtonSelector);
+            [OpenQA.Selenium.IWebElement] $element = $null;
+
+            for ($i = 0; $i -lt 5; $i++) {
+                $element = $Browser.FindElement($selector);
+
+                if ($element) {
+                    break;
+                } else {
+                    Start-Sleep 1;
+                }
+            }
+
+            if ($element) {
+                $Browser.FindElement([OpenQA.Selenium.By]::CssSelector($ButtonSelector)).Click();
+            } else {
+                throw "Unable to find download button!";
+            }
         };
     }
 };