diff --git a/tmtcpacket/pus/TcPacketStored.cpp b/tmtcpacket/pus/TcPacketStored.cpp
index 3f10cac0..64b369ea 100644
--- a/tmtcpacket/pus/TcPacketStored.cpp
+++ b/tmtcpacket/pus/TcPacketStored.cpp
@@ -20,9 +20,9 @@ TcPacketStored::TcPacketStored(uint8_t service, uint8_t subservice,
 	uint8_t* p_data = nullptr;
 	ReturnValue_t returnValue = this->store->getFreeElement(&this->storeAddress,
 			(TC_PACKET_MIN_SIZE + size), &p_data);
-	if (returnValue != this->store->RETURN_OK) {
-		sif::warning << "TcPacketStored: Could not get free element from store!"
-				<< std::endl;
+	if (returnValue != HasReturnvaluesIF::RETURN_OK) {
+		sif::warning << "TcPacketStored::TcPacketStored: Could not get "
+				"free element from store!" << std::endl;
 		return;
 	}
 	this->setData(p_data);
@@ -57,9 +57,9 @@ ReturnValue_t TcPacketStored::deletePacket() {
 }
 
 bool TcPacketStored::checkAndSetStore() {
-	if (this->store == NULL) {
+	if (this->store == nullptr) {
 		this->store = objectManager->get<StorageManagerIF>(objects::TC_STORE);
-		if (this->store == NULL) {
+		if (this->store == nullptr) {
 			sif::error << "TcPacketStored::TcPacketStored: TC Store not found!"
 					<< std::endl;
 			return false;
diff --git a/tmtcpacket/pus/TmPacketStored.cpp b/tmtcpacket/pus/TmPacketStored.cpp
index e42f8cda..9476dcd6 100644
--- a/tmtcpacket/pus/TmPacketStored.cpp
+++ b/tmtcpacket/pus/TmPacketStored.cpp
@@ -21,8 +21,9 @@ TmPacketStored::TmPacketStored(uint16_t apid, uint8_t service,
 	ReturnValue_t returnValue = store->getFreeElement(&storeAddress,
 			(TmPacketBase::TM_PACKET_MIN_SIZE + size + headerSize), &pData);
 
-	if (returnValue != store->RETURN_OK) {
-		sif::debug << "TM Packet Stored: Issue getting free storage" << std::endl;
+	if (returnValue != HasReturnvaluesIF::RETURN_OK) {
+		sif::debug << "TmPacketStored::TmPacketStored: "
+				"Issue getting free storage" << std::endl;
 		checkAndReportLostTm();
 		return;
 	}