Looks like throwing behavior changed on FirstOrDefault, and not in a good way
should throw instead of return null on other exceptions
Merge branch 'release-5.2.0'