fix #SPOI-2171 DFS Error Handling