Better Error Handling and Upgrade to Visual Studio 2012