Copy from edwinmoss, improve exception handling in finder
Copy from edwinmoss, improve exception handling in finder

mallikarjunayaddala/active_scaffold,budree/active_scaffold,AlbertoBarrago/active_scaffold,mallikarjunayaddala/active_scaffold,activescaffold/active_scaffold,budree/active_scaffold,activescaffold/active_scaffold,mallikarjunayaddala/active_scaffold,budree/active_scaffold,AlbertoBarrago/active_scaffold,activescaffold/active_scaffold,AlbertoBarrago/active_scaffold