diff --git a/utils/query-state/Configuration.psm1 b/utils/query-state/Configuration.psm1
index d8e3948..80ae604 100644
--- a/utils/query-state/Configuration.psm1
+++ b/utils/query-state/Configuration.psm1
@@ -1,11 +1,15 @@
 
 function Get-Configuration() {
-    $remote = Get-ConfiguredRemote
-    return @{
-        remote = $remote
-        dependencyBranch = Get-ConfiguredDependencyBranch
-        defaultServiceLine = Get-ConfiguredDefaultServiceLine -remote $remote
-        atomicPushEnabled = Get-ConfiguredAtomicPushEnabled
+    try {
+        $remote = Get-ConfiguredRemote
+        return @{
+            remote = $remote
+            dependencyBranch = Get-ConfiguredDependencyBranch
+            defaultServiceLine = Get-ConfiguredDefaultServiceLine -remote $remote
+            atomicPushEnabled = Get-ConfiguredAtomicPushEnabled
+        }
+    } finally {
+        $Global:LASTEXITCODE = 0
     }
 }