fixed up error handling and matching on page 2