Improve JS to keep to choice after exceptions