diff --git a/EduNetworkBuilder/NetTest.cs b/EduNetworkBuilder/NetTest.cs
index 9e9b231..5fdcd43 100644
--- a/EduNetworkBuilder/NetTest.cs
+++ b/EduNetworkBuilder/NetTest.cs
@@ -514,6 +514,8 @@ namespace EduNetworkBuilder
                 case NetTestType.ReadContextHelp:
                 case NetTestType.FailedPing:
                 case NetTestType.DeviceIsFrozen:
+                case NetTestType.DeviceBlowsUpWithPower:
+                case NetTestType.DeviceNeedsUPS:
                     return TaskWasDone; //This variable will tell us if these tests have been done.
                 case NetTestType.DHCPServerEnabled:
                     if (Source == null) return false; //Unable to do it.  Do not count it against them.
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index bde929d..db9dd6c 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -726,6 +726,11 @@ namespace EduNetworkBuilder
                 {
                     PuzzleCount++;
                 }
+                if(nt.TheTest == NetTestType.DeviceBlowsUpWithPower && !nt.TaskWasDone)
+                {
+                    NetworkDevice ND = DeviceFromName(nt.sHost);
+                    if (ND != null) ND.PowerOff = true;
+                }
             }
             if (report_as_done && PuzzleCount == 0 && PreviouslyUnsolved)
             {