diff --git a/mission/devices/IMTQHandler.cpp b/mission/devices/IMTQHandler.cpp
index 2b3ba240..07f610b7 100644
--- a/mission/devices/IMTQHandler.cpp
+++ b/mission/devices/IMTQHandler.cpp
@@ -10,7 +10,6 @@
 IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
                          power::Switch_t pwrSwitcher)
     : DeviceHandlerBase(objectId, comIF, comCookie),
-      switcher(pwrSwitcher),
       engHkDataset(this),
       calMtmMeasurementSet(this),
       rawMtmMeasurementSet(this),
@@ -19,8 +18,9 @@ IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comC
       posYselfTestDataset(this),
       negYselfTestDataset(this),
       posZselfTestDataset(this),
-      negZselfTestDataset(this) {
-  if (comCookie == NULL) {
+      negZselfTestDataset(this),
+      switcher(pwrSwitcher) {
+  if (comCookie == nullptr) {
     sif::error << "IMTQHandler: Invalid com cookie" << std::endl;
   }
 }