Added extra exceptions for Visual Studio