--- +++ @@ -2089,9 +2089,13 @@ /* Setup FS command to follow SETUP command */ rfc_CMD_FS_t* pOpFs; - RF_Cmd* pOpPend = Q_peek(&cmdQ.pPend)->pOp; - - if ((pOpFirstPend->commandNo == CMD_FS) || (pOpFirstPend->commandNo == CMD_FS_OFF)) + RF_Cmd* pOpPend = Q_peek(&cmdQ.pPend); + RF_Op* pOpFirstPend = NULL; + + if (pOpPend) + pOpFirstPend = pOpPend->pOp; + + if (pOpFirstPend && (pOpFirstPend->commandNo == CMD_FS) || (pOpFirstPend->commandNo == CMD_FS_OFF)) { /* First command is FS command so no need to chain an implicit FS command Reset nRtc1 */