diff --git a/bsp_q7s/memory/SdCardManager.cpp b/bsp_q7s/memory/SdCardManager.cpp
index 1b03ad75..cfd4f490 100644
--- a/bsp_q7s/memory/SdCardManager.cpp
+++ b/bsp_q7s/memory/SdCardManager.cpp
@@ -20,9 +20,16 @@ SdCardManager* SdCardManager::INSTANCE = nullptr;
 
 SdCardManager::SdCardManager() : SystemObject(objects::SDC_MANAGER), cmdExecutor(256) {
   mutex = MutexFactory::instance()->createMutex();
-  MutexGuard mg(mutex);
+  ReturnValue_t result = mutex->lockMutex();
+  if (result != RETURN_OK) {
+    sif::error << "SdCardManager::SdCardManager: Mutex lock failed" << std::endl;
+  }
   uint8_t prefSdRaw = 0;
-  ReturnValue_t result = scratch::readNumber(scratch::PREFERED_SDC_KEY, prefSdRaw);
+  result = scratch::readNumber(scratch::PREFERED_SDC_KEY, prefSdRaw);
+  result = mutex->unlockMutex();
+  if (result != RETURN_OK) {
+    sif::error << "SdCardManager::SdCardManager: Mutex unlock failed" << std::endl;
+  }
 
   if (result != HasReturnvaluesIF::RETURN_OK) {
     if (result == scratch::KEY_NOT_FOUND) {
diff --git a/bsp_q7s/memory/scratchApi.h b/bsp_q7s/memory/scratchApi.h
index 96264995..cd76fca1 100644
--- a/bsp_q7s/memory/scratchApi.h
+++ b/bsp_q7s/memory/scratchApi.h
@@ -76,12 +76,12 @@ ReturnValue_t readToFile(std::string name, std::ifstream& file, std::string& fil
   int result = std::system(oss.str().c_str());
   if (result != 0) {
     if (WEXITSTATUS(result) == 1) {
-      sif::warning << "scratch::readNumber: Key " << name << " does not exist" << std::endl;
+      sif::warning << "scratch::readToFile: Key " << name << " does not exist" << std::endl;
       // Could not find value
       std::remove(filename.c_str());
       return KEY_NOT_FOUND;
     } else {
-      utility::handleSystemError(result, "scratch::readNumber");
+      utility::handleSystemError(result, "scratch::readToFile");
       std::remove(filename.c_str());
       return HasReturnvaluesIF::RETURN_FAILED;
     }