DFS: Exception fixes in legacy dfs cluster