Added Exception Handler
update Remove redundant and useless filter