diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 7ff1198..85dedf4 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -340,7 +340,11 @@
                         // keep user changes
                         _systemConfiguration[recordName] = *fromLastJson;
                         _missingConfigurations.erase(recordName);
+
+                        // We've processed the device, remove it and advance the
+                        // iterator
                         itr = foundDevices.erase(itr);
+
                         if (hasTemplateName)
                         {
                             auto nameIt = fromLastJson->find("Name");