added error handing to property setters
changed to Entity Framework 6.1.1