diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp
index d0630854..efee1462 100644
--- a/devicehandlers/DeviceHandlerBase.cpp
+++ b/devicehandlers/DeviceHandlerBase.cpp
@@ -16,8 +16,8 @@
 #include <iomanip>
 
 
-object_id_t DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
-object_id_t DeviceHandlerBase::rawDataReceiverId = objects::NO_OBJECT;
+object_id_t DeviceHandlerBase::defaultPowerSwitcherId = objects::NO_OBJECT;
+object_id_t DeviceHandlerBase::defaultRawDataReceiverId = objects::NO_OBJECT;
 object_id_t DeviceHandlerBase::defaultFdirParentId = objects::NO_OBJECT;
 
 DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId,
@@ -151,9 +151,9 @@ ReturnValue_t DeviceHandlerBase::initialize() {
 		return ObjectManagerIF::CHILD_INIT_FAILED;
 	}
 
-	if(rawDataReceiverId != objects::NO_OBJECT) {
+	if(defaultRawDataReceiverId != objects::NO_OBJECT) {
 		AcceptsDeviceResponsesIF *rawReceiver = objectManager->get<
-				AcceptsDeviceResponsesIF>(rawDataReceiverId);
+				AcceptsDeviceResponsesIF>(defaultRawDataReceiverId);
 
 		if (rawReceiver == nullptr) {
 			sif::error << "DeviceHandlerBase::initialize: Raw receiver object "
@@ -165,8 +165,9 @@ ReturnValue_t DeviceHandlerBase::initialize() {
 		defaultRawReceiver = rawReceiver->getDeviceQueue();
 	}
 
-	if(powerSwitcherId != objects::NO_OBJECT) {
-		powerSwitcher = objectManager->get<PowerSwitchIF>(powerSwitcherId);
+	if(defaultPowerSwitcherId != objects::NO_OBJECT) {
+		powerSwitcher = objectManager->get<PowerSwitchIF>(
+				defaultPowerSwitcherId);
 		if (powerSwitcher == nullptr) {
 			sif::error << "DeviceHandlerBase::initialize: Power switcher "
 					<< "object ID set but no valid object found." << std::endl;
@@ -682,8 +683,10 @@ void DeviceHandlerBase::doGetRead() {
 		replyRawData(receivedData, receivedDataLen, requestedRawTraffic);
 	}
 
-	if (mode == MODE_RAW and defaultRawReceiver != MessageQueueIF::NO_QUEUE) {
-		replyRawReplyIfnotWiretapped(receivedData, receivedDataLen);
+	if (mode == MODE_RAW) {
+		if(defaultRawReceiver != MessageQueueIF::NO_QUEUE) {
+			replyRawReplyIfnotWiretapped(receivedData, receivedDataLen);
+		}
 	}
 	else {
 		parseReply(receivedData, receivedDataLen);
diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h
index 24ba0372..0d14bf4e 100644
--- a/devicehandlers/DeviceHandlerBase.h
+++ b/devicehandlers/DeviceHandlerBase.h
@@ -739,10 +739,10 @@ protected:
 	PeriodicTaskIF* executingTask = nullptr;
 
 	//!< Object which switches power on and off.
-	static object_id_t powerSwitcherId;
+	static object_id_t defaultPowerSwitcherId;
 
 	//!< Object which receives RAW data by default.
-	static object_id_t rawDataReceiverId;
+	static object_id_t defaultRawDataReceiverId;
 
 	//!< Object which may be the root cause of an identified fault.
 	static object_id_t defaultFdirParentId;