diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index 0858b48d..2a07def5 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "fsfw/filesystem/HasFileSystemIF.h"
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/returnvalues/returnvalue.h"
 #include "mission/memory/SdCardMountedIF.h"
@@ -177,7 +178,7 @@ void StarTrackerHandler::loadTargetFirmwareFromPersistentCfg() {
   const char* prefix = sdCardIF.getCurrentMountPrefix();
   std::filesystem::path path = std::filesystem::path(prefix) / startracker::FW_TARGET_CFG_PATH;
   std::ifstream ifile(path);
-  if (ifile.is_open()) {
+  if (ifile.is_open() and !ifile.bad()) {
     std::string targetStr;
     std::getline(ifile, targetStr);
     if (targetStr == "backup") {
@@ -2896,7 +2897,7 @@ ReturnValue_t StarTrackerHandler::checkCommand(ActionId_t actionId) {
     case startracker::REQ_CENTROID:
     case startracker::REQ_CENTROIDS:
     case startracker::REQ_CONTRAST: {
-      if (getMode() == MODE_ON and getSubmode() != startracker::Program::FIRMWARE_MAIN) {
+      if (getMode() == MODE_ON and getSubmode() != startracker::SUBMODE_FIRMWARE) {
         return STARTRACKER_NOT_RUNNING_FIRMWARE;
       }
       break;
@@ -2904,7 +2905,7 @@ ReturnValue_t StarTrackerHandler::checkCommand(ActionId_t actionId) {
     case startracker::FIRMWARE_UPDATE_MAIN:
     case startracker::FIRMWARE_UPDATE_BACKUP:
     case startracker::FLASH_READ:
-      if (getMode() != MODE_ON or getSubmode() != startracker::Program::BOOTLOADER) {
+      if (getMode() != MODE_ON or getSubmode() != startracker::SUBMODE_BOOTLOADER) {
         return STARTRACKER_NOT_RUNNING_BOOTLOADER;
       }
       break;
@@ -2940,8 +2941,7 @@ ReturnValue_t StarTrackerHandler::getParameter(uint8_t domainId, uint8_t uniqueI
           of << "backup\n";
         }
       } else {
-        sif::warning << "SD card not usable" << std::endl;
-        return returnvalue::FAILED;
+        return HasFileSystemIF::FILESYSTEM_INACTIVE;
       }
     };
     return returnvalue::OK;
diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp
index daaf59cc..c5a69b26 100644
--- a/mission/genericFactory.cpp
+++ b/mission/genericFactory.cpp
@@ -253,7 +253,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
 
   auto psbParamsService5 =
       PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5);
-  psbParamsService5.requestQueueDepth = 50; 
+  psbParamsService5.requestQueueDepth = 50;
   psbParamsService5.maxPacketsPerCycle = 50;
   new Service5EventReporting(psbParamsService5, 80, 160);
   new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID,