add comments, check for ExitError which means no matches