Reset SelectionHandler state upon exception
Merge pull request #50 from tmeshkova/fix-state-mgmt

Reset SelectionHandler state upon exception