diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index e7d8779b..bc9139fb 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -173,9 +173,13 @@ void initmission::createPstTasks(TaskFactory& factory,
             missedDeadlineFunc);
     result = pst::pstSpi(spiPst);
     if (result != HasReturnvaluesIF::RETURN_OK) {
-        sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+        if(result != FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
+            sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+        }
+    }
+    else {
+        taskVec.push_back(spiPst);
     }
-    taskVec.push_back(spiPst);
 #endif
 
     FixedTimeslotTaskIF* uartPst = factory.createFixedTimeslotTask(
diff --git a/fsfw b/fsfw
index e1a85b47..0987a160 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit e1a85b47c5018590e58b9b1130b1754b0079450f
+Subproject commit 0987a160c9c200e1b7b72e992ae158d826147c30
diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
index 3b826119..17cdc206 100644
--- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@@ -536,9 +536,16 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
     }
 #endif /* OBSW_ADD_ACS_BOARD == 1 */
 
-    if (thisSequence->checkSequence() != HasReturnvaluesIF::RETURN_OK) {
-        sif::error << "SPI PST initialization failed" << std::endl;
-        return HasReturnvaluesIF::RETURN_FAILED;
+    ReturnValue_t seqCheck = thisSequence->checkSequence();
+    if (seqCheck != HasReturnvaluesIF::RETURN_OK) {
+        if(seqCheck == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
+            sif::warning << "SPI PST is empty.." << std::endl;
+        }
+        else {
+            sif::error << "SPI PST initialization failed" << std::endl;
+        }
+
+        return seqCheck;
     }
     return HasReturnvaluesIF::RETURN_OK;
 }