change exception types to match Linq exceptions under simlar circumstances