Minor fixes
Update to .NET 4.5.1
Small cleanup
Improved error handling