added exception filtering