Event handler refactored; ParseException added