diff --git a/source/orchestrationLogic/HEAT/bootup.ps1 b/source/orchestrationLogic/HEAT/bootup.ps1
index 14f043bee66e121649b9682a70bd131e48836c9e..4e4065e3db8b5e10a469c95785626c6aff1ef345 100644
--- a/source/orchestrationLogic/HEAT/bootup.ps1
+++ b/source/orchestrationLogic/HEAT/bootup.ps1
@@ -39,10 +39,15 @@ if( !(Test-Path -Path "C:\flag.txt")) {
     } while ((-Not $joined) -And ($i -lt 25))
 
 }else {
+    $added = $true
     $i = 0
     do {
+        try{
         <RDPMembers> # Adds users to the rdp member group
-        $i = $i+1
+        } catch{
+            $added = $false
+            $i = $i+1
+        }
 
     } while($i -lt 10)
 }
diff --git a/source/orchestrationLogic/orchestrator.py b/source/orchestrationLogic/orchestrator.py
index 0c2b7838c55619c2349faa32e63d88ce3cfd107b..f639a59fc8c6aa30b2b4dc3db11b60d253cb9923 100644
--- a/source/orchestrationLogic/orchestrator.py
+++ b/source/orchestrationLogic/orchestrator.py
@@ -158,6 +158,6 @@ class Orchestrator:
     def allowRDP(self, members):
         result = ''
         for member in members:
-            result += "Add-LocalGroupMember -Group 'Remote Desktop Users' -Member '{}';".format(member)
+            result += "Add-LocalGroupMember -Group 'Remote Desktop Users' -Member '{}' -ErrorAction Stop;".format(member)
         return result