Upgraded to EF 6.0 Final
Revised to use shortened query form when reporting errors