improving exception naming and filter