diff --git a/src/CppParser/Bindings/CLI/AST.cpp b/src/CppParser/Bindings/CLI/AST.cpp
index ea9086eb..8b06f21e 100644
--- a/src/CppParser/Bindings/CLI/AST.cpp
+++ b/src/CppParser/Bindings/CLI/AST.cpp
@@ -863,7 +863,7 @@ System::String^ CppSharp::Parser::AST::TemplateParameter::Name::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::TemplateParameter*)NativePtr)->getName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::TemplateParameter::Name::set(System::String^ s)
@@ -1577,7 +1577,7 @@ System::String^ CppSharp::Parser::AST::Declaration::Name::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->getName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::Declaration::Name::set(System::String^ s)
@@ -1591,7 +1591,7 @@ System::String^ CppSharp::Parser::AST::Declaration::DebugText::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->getDebugText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::Declaration::DebugText::set(System::String^ s)
@@ -2128,7 +2128,7 @@ System::String^ CppSharp::Parser::AST::Statement::String::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Statement*)NativePtr)->getString();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::Statement::String::set(System::String^ s)
@@ -2222,7 +2222,7 @@ System::String^ CppSharp::Parser::AST::BinaryOperator::OpcodeStr::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::BinaryOperator*)NativePtr)->getOpcodeStr();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::BinaryOperator::OpcodeStr::set(System::String^ s)
@@ -2512,7 +2512,7 @@ System::String^ CppSharp::Parser::AST::Function::Mangled::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Function*)NativePtr)->getMangled();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::Function::Mangled::set(System::String^ s)
@@ -2526,7 +2526,7 @@ System::String^ CppSharp::Parser::AST::Function::Signature::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Function*)NativePtr)->getSignature();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::Function::Signature::set(System::String^ s)
@@ -2820,7 +2820,7 @@ System::String^ CppSharp::Parser::AST::Enumeration::Item::Expression::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Enumeration::Item*)NativePtr)->getExpression();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::Enumeration::Item::Expression::set(System::String^ s)
@@ -2974,7 +2974,7 @@ System::String^ CppSharp::Parser::AST::Variable::Mangled::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::Variable*)NativePtr)->getMangled();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::Variable::Mangled::set(System::String^ s)
@@ -4023,7 +4023,7 @@ System::String^ CppSharp::Parser::AST::MacroDefinition::Name::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::MacroDefinition*)NativePtr)->getName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::MacroDefinition::Name::set(System::String^ s)
@@ -4037,7 +4037,7 @@ System::String^ CppSharp::Parser::AST::MacroDefinition::Expression::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::MacroDefinition*)NativePtr)->getExpression();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::MacroDefinition::Expression::set(System::String^ s)
@@ -4108,7 +4108,7 @@ System::String^ CppSharp::Parser::AST::MacroExpansion::Name::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::MacroExpansion*)NativePtr)->getName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::MacroExpansion::Name::set(System::String^ s)
@@ -4122,7 +4122,7 @@ System::String^ CppSharp::Parser::AST::MacroExpansion::Text::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::MacroExpansion*)NativePtr)->getText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::MacroExpansion::Text::set(System::String^ s)
@@ -4203,7 +4203,7 @@ System::String^ CppSharp::Parser::AST::TranslationUnit::FileName::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::TranslationUnit*)NativePtr)->getFileName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::TranslationUnit::FileName::set(System::String^ s)
@@ -4255,7 +4255,7 @@ System::String^ CppSharp::Parser::AST::NativeLibrary::getSymbols(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::AST::NativeLibrary*)NativePtr)->getSymbols(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::NativeLibrary::addSymbols(System::String^ s)
@@ -4274,7 +4274,7 @@ System::String^ CppSharp::Parser::AST::NativeLibrary::getDependencies(unsigned i
 {
     auto __ret = ((::CppSharp::CppParser::AST::NativeLibrary*)NativePtr)->getDependencies(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::NativeLibrary::addDependencies(System::String^ s)
@@ -4312,7 +4312,7 @@ System::String^ CppSharp::Parser::AST::NativeLibrary::FileName::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::NativeLibrary*)NativePtr)->getFileName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::NativeLibrary::FileName::set(System::String^ s)
@@ -4610,7 +4610,7 @@ System::String^ CppSharp::Parser::AST::BlockCommandComment::Argument::Text::get(
 {
     auto __ret = ((::CppSharp::CppParser::AST::BlockCommandComment::Argument*)NativePtr)->getText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::BlockCommandComment::Argument::Text::set(System::String^ s)
@@ -4860,7 +4860,7 @@ System::String^ CppSharp::Parser::AST::VerbatimBlockLineComment::Text::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::VerbatimBlockLineComment*)NativePtr)->getText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::VerbatimBlockLineComment::Text::set(System::String^ s)
@@ -4974,7 +4974,7 @@ System::String^ CppSharp::Parser::AST::VerbatimLineComment::Text::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::VerbatimLineComment*)NativePtr)->getText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::VerbatimLineComment::Text::set(System::String^ s)
@@ -5141,7 +5141,7 @@ System::String^ CppSharp::Parser::AST::InlineCommandComment::Argument::Text::get
 {
     auto __ret = ((::CppSharp::CppParser::AST::InlineCommandComment::Argument*)NativePtr)->getText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::InlineCommandComment::Argument::Text::set(System::String^ s)
@@ -5308,7 +5308,7 @@ System::String^ CppSharp::Parser::AST::HTMLStartTagComment::Attribute::Name::get
 {
     auto __ret = ((::CppSharp::CppParser::AST::HTMLStartTagComment::Attribute*)NativePtr)->getName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::HTMLStartTagComment::Attribute::Name::set(System::String^ s)
@@ -5322,7 +5322,7 @@ System::String^ CppSharp::Parser::AST::HTMLStartTagComment::Attribute::Value::ge
 {
     auto __ret = ((::CppSharp::CppParser::AST::HTMLStartTagComment::Attribute*)NativePtr)->getValue();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::HTMLStartTagComment::Attribute::Value::set(System::String^ s)
@@ -5393,7 +5393,7 @@ System::String^ CppSharp::Parser::AST::HTMLStartTagComment::TagName::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::HTMLStartTagComment*)NativePtr)->getTagName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::HTMLStartTagComment::TagName::set(System::String^ s)
@@ -5450,7 +5450,7 @@ System::String^ CppSharp::Parser::AST::HTMLEndTagComment::TagName::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::HTMLEndTagComment*)NativePtr)->getTagName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::HTMLEndTagComment::TagName::set(System::String^ s)
@@ -5501,7 +5501,7 @@ System::String^ CppSharp::Parser::AST::TextComment::Text::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::TextComment*)NativePtr)->getText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::TextComment::Text::set(System::String^ s)
@@ -5556,7 +5556,7 @@ System::String^ CppSharp::Parser::AST::RawComment::Text::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->getText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::RawComment::Text::set(System::String^ s)
@@ -5570,7 +5570,7 @@ System::String^ CppSharp::Parser::AST::RawComment::BriefText::get()
 {
     auto __ret = ((::CppSharp::CppParser::AST::RawComment*)NativePtr)->getBriefText();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::AST::RawComment::BriefText::set(System::String^ s)
diff --git a/src/CppParser/Bindings/CLI/CppParser.cpp b/src/CppParser/Bindings/CLI/CppParser.cpp
index 32d5cadb..fe0ca62c 100644
--- a/src/CppParser/Bindings/CLI/CppParser.cpp
+++ b/src/CppParser/Bindings/CLI/CppParser.cpp
@@ -31,7 +31,7 @@ System::String^ CppSharp::Parser::ParserOptions::getArguments(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getArguments(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::addArguments(System::String^ s)
@@ -50,7 +50,7 @@ System::String^ CppSharp::Parser::ParserOptions::getIncludeDirs(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getIncludeDirs(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::addIncludeDirs(System::String^ s)
@@ -69,7 +69,7 @@ System::String^ CppSharp::Parser::ParserOptions::getSystemIncludeDirs(unsigned i
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getSystemIncludeDirs(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::addSystemIncludeDirs(System::String^ s)
@@ -88,7 +88,7 @@ System::String^ CppSharp::Parser::ParserOptions::getDefines(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getDefines(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::addDefines(System::String^ s)
@@ -107,7 +107,7 @@ System::String^ CppSharp::Parser::ParserOptions::getUndefines(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getUndefines(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::addUndefines(System::String^ s)
@@ -126,7 +126,7 @@ System::String^ CppSharp::Parser::ParserOptions::getLibraryDirs(unsigned int i)
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getLibraryDirs(i);
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::addLibraryDirs(System::String^ s)
@@ -170,7 +170,7 @@ System::String^ CppSharp::Parser::ParserOptions::FileName::get()
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getFileName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::FileName::set(System::String^ s)
@@ -214,7 +214,7 @@ System::String^ CppSharp::Parser::ParserOptions::TargetTriple::get()
 {
     auto __ret = ((::CppSharp::CppParser::ParserOptions*)NativePtr)->getTargetTriple();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserOptions::TargetTriple::set(System::String^ s)
@@ -359,7 +359,7 @@ System::String^ CppSharp::Parser::ParserDiagnostic::FileName::get()
 {
     auto __ret = ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->getFileName();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserDiagnostic::FileName::set(System::String^ s)
@@ -373,7 +373,7 @@ System::String^ CppSharp::Parser::ParserDiagnostic::Message::get()
 {
     auto __ret = ((::CppSharp::CppParser::ParserDiagnostic*)NativePtr)->getMessage();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserDiagnostic::Message::set(System::String^ s)
diff --git a/src/CppParser/Bindings/CLI/Target.cpp b/src/CppParser/Bindings/CLI/Target.cpp
index 9afcc31a..8071668b 100644
--- a/src/CppParser/Bindings/CLI/Target.cpp
+++ b/src/CppParser/Bindings/CLI/Target.cpp
@@ -48,7 +48,7 @@ System::String^ CppSharp::Parser::ParserTargetInfo::ABI::get()
 {
     auto __ret = ((::CppSharp::CppParser::ParserTargetInfo*)NativePtr)->getABI();
     if (__ret == nullptr) return nullptr;
-    return clix::marshalString<clix::E_UTF8>(__ret);
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
 }
 
 void CppSharp::Parser::ParserTargetInfo::ABI::set(System::String^ s)