[TASK] Separate Error handling from TSFE