From 73dcb78a65d0367d4a5ddaaf8ceba379d61a3990 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 27 Jan 2021 20:04:16 +0100
Subject: [PATCH] additional nullptr checks

---
 objectmanager/ObjectManager.cpp | 4 +++-
 objectmanager/SystemObject.cpp  | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/objectmanager/ObjectManager.cpp b/objectmanager/ObjectManager.cpp
index 882d2762..3c2be532 100644
--- a/objectmanager/ObjectManager.cpp
+++ b/objectmanager/ObjectManager.cpp
@@ -1,5 +1,5 @@
 #include "ObjectManager.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../serviceinterface/ServiceInterface.h"
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 #include <iomanip>
@@ -75,6 +75,8 @@ void ObjectManager::initialize() {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 		sif::error << "ObjectManager::initialize: Passed produceObjects "
 				"functions is nullptr!" << std::endl;
+#else
+		sif::printError("ObjectManager::initialize: Passed produceObjects functions is nullptr!\n");
 #endif
 		return;
 	}
diff --git a/objectmanager/SystemObject.cpp b/objectmanager/SystemObject.cpp
index 64330fbc..9040002c 100644
--- a/objectmanager/SystemObject.cpp
+++ b/objectmanager/SystemObject.cpp
@@ -5,13 +5,17 @@
 SystemObject::SystemObject(object_id_t setObjectId, bool doRegister) :
 		objectId(setObjectId), registered(doRegister) {
 	if (registered) {
-		objectManager->insert(objectId, this);
+	    if(objectManager != nullptr) {
+	        objectManager->insert(objectId, this);
+	    }
 	}
 }
 
 SystemObject::~SystemObject() {
 	if (registered) {
-		objectManager->remove(objectId);
+	    if(objectManager != nullptr) {
+	        objectManager->remove(objectId);
+	    }
 	}
 }