diff --git a/simulation/devicepluginsimulation.cpp b/simulation/devicepluginsimulation.cpp
index 4d49f3e8..5ff8f097 100644
--- a/simulation/devicepluginsimulation.cpp
+++ b/simulation/devicepluginsimulation.cpp
@@ -62,9 +62,12 @@ DeviceManager::DeviceSetupStatus DevicePluginSimulation::setupDevice(Device *dev
 
 void DevicePluginSimulation::deviceRemoved(Device *device)
 {
-    QTimer *t = m_simulationTimers.take(device);
-    t->stop();
-    t->deleteLater();
+    // Clean up any timers we may have for this device
+    if (m_simulationTimers.contains(device)) {
+        QTimer *t = m_simulationTimers.take(device);
+        t->stop();
+        t->deleteLater();
+    }
 }
 
 DeviceManager::DeviceError DevicePluginSimulation::executeAction(Device *device, const Action &action)