fix #SPOI-2171 DFS Error Handling
Merge pull request #843 from nickholub/q10

fix #SPOI-2171 DFS Error Handling