diff --git a/byos/app-modernization-no-sql/deploy/deployAll.ps1 b/byos/app-modernization-no-sql/deploy/deployAll.ps1
index 0ac6068..6d9877d 100644
--- a/byos/app-modernization-no-sql/deploy/deployAll.ps1
+++ b/byos/app-modernization-no-sql/deploy/deployAll.ps1
@@ -10,6 +10,7 @@ $sqlAdministratorLogin = "openhackadmin"
 # Enter the SQL Server password (i.e. Password123)
 $sqlAdministratorLoginPassword = "Password123"
 
+[int]$failedEnvironments = 0
 for ($i = 1; $i -le $teamCount; $i++)
 {
     try 
@@ -34,9 +35,6 @@ for ($i = 1; $i -le $teamCount; $i++)
 
         $rg1 = Get-AzResourceGroup -Name $resourceGroup1Name;
         $rg2 = Get-AzResourceGroup -Name $resourceGroup2Name;
-
-        # Write-Output $rg1;
-        # Write-Output $rg2;
         
         if ($rg1 -ne $null -and $rg2 -ne $null -and $rg1.Name -ne '' -and $rg2.Name -ne '')
         {
@@ -71,14 +69,21 @@ for ($i = 1; $i -le $teamCount; $i++)
         else
         {
             #report error for incorrect RG deployment
-            Write-Output("Deployment failed for team: " + $teamName + ". Resource Groups could not be found.");
+            $failedEnvironments += 1
+            Write-Error("Deployment failed for team: " + $teamName + ". Resource Groups could not be found.");
         }
     }
     catch {
         #report error, team deployment failure
-        Write-Output "An error was encountered, script could not complete:  $($PSItem.ToString())";
+        $failedEnvironments += 1
+        Write-Error "An error was encountered, script could not complete:  $($PSItem.ToString())";
     }
 }
 
 #report operation completed
-Write-Output "All resources are deployed.  Enjoy the OpenHack!";
+if($failedEnvironments -eq 0) {
+    Write-Output "All resources are deployed.  Enjoy the OpenHack!";
+}
+else {
+    Write-Error "$failedEnvironments environments failed either provisioning or validation. Please check output for more details"
+}
diff --git a/byos/app-modernization-no-sql/deploy/deploy_03_ImportData.ps1 b/byos/app-modernization-no-sql/deploy/deploy_03_ImportData.ps1
index fdbce7a..b34e235 100644
--- a/byos/app-modernization-no-sql/deploy/deploy_03_ImportData.ps1
+++ b/byos/app-modernization-no-sql/deploy/deploy_03_ImportData.ps1
@@ -1,6 +1,6 @@
 #
 #  Import data, run after ensure database
-#   Reuquies pre-defined variables: $sqlserverName, $databaseName, $sqlAdministratorLogin, $sqlAdministratorLoginPassword
+#   Requires pre-defined variables: $sqlserverName, $databaseName, $sqlAdministratorLogin, $sqlAdministratorLoginPassword
 #
 
 $importRequest = New-AzSqlDatabaseImport -ResourceGroupName $resourceGroup1Name `
@@ -22,5 +22,10 @@ while ($importStatus.Status -eq "InProgress") {
     Start-Sleep -s 10
 }
 
+if($importStatus.Status -ne 'Succeeded') {
+    Write-Error "Failed to import database $databaseName for server $sqlServerName"
+    Write-Debug $importStatus
+}
+
 [Console]::WriteLine("")
 $importStatus
diff --git a/byos/app-modernization-no-sql/deploy/deploy_04_FinalValidation.ps1 b/byos/app-modernization-no-sql/deploy/deploy_04_FinalValidation.ps1
index 3171463..8286878 100644
--- a/byos/app-modernization-no-sql/deploy/deploy_04_FinalValidation.ps1
+++ b/byos/app-modernization-no-sql/deploy/deploy_04_FinalValidation.ps1
@@ -12,5 +12,5 @@ if($availabilityResult.StatusCode -eq 200) {
     Write-Output ("Website is available")
 }
 else {
-    Write-Output("Website availability check failed for team: " + $teamName)
+    Write-Error("Website availability check failed for team: " + $teamName)
 }
\ No newline at end of file