diff --git a/EduNetworkBuilder/ActionClass.cs b/EduNetworkBuilder/ActionClass.cs
index 25fc6e7..20a6367 100644
--- a/EduNetworkBuilder/ActionClass.cs
+++ b/EduNetworkBuilder/ActionClass.cs
@@ -255,7 +255,7 @@ namespace EduNetworkBuilder
                     if (CanDo)
                     {
                         ChangedComponent = (NetworkDevice)myNet.AddItem(newItemType, Location);
-                        if (NB.DebugActions) { Console.WriteLine("Adding a Device: " + source.hostname); }
+                        if (NB.DebugActions && source != null) { Console.WriteLine("Adding a Device: " + source.hostname); }
                     }
                     else
                     {
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 32d55a4..280282d 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -1695,7 +1695,8 @@ namespace EduNetworkBuilder
                     NBSettings Settings = NB.GetSettings();
                     ActionCollection AC = Settings.GetUserActionCollection();
                     ActionClass Success = AC.RunAction(NextReplayIndex++);
-                    
+
+
                     NextReplayAction = DateTime.UtcNow.AddMilliseconds(NB.MillisecondsBetweenReplays);
                     DoAllAutoJoin(); //Connect network links if we need to do so
                     if(Success != null)
@@ -1703,6 +1704,7 @@ namespace EduNetworkBuilder
                         //we did something.  keep replaying
                         NB.MarkToUpdate();
                         StartedNewReplayAction = true;
+                        previously_had_packets = false; //This will make sure we reset packet counters
                     }
                     else
                     {