diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs
index 4443c8b4..99abd2db 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs
@@ -82,10 +82,18 @@ namespace UniversalEditor.DataFormats.SourceCode
 			return sb.ToString();
 		}
 
-		protected virtual string MakeFriendlyDataType(string DataType)
+		public string MakeFriendlyDataType(string DataType)
+		{
+			if (String.IsNullOrEmpty (DataType))
+				DataType = "System.Void";
+
+			return MakeFriendlyDataTypeInternal (DataType);
+		}
+		protected virtual string MakeFriendlyDataTypeInternal(string DataType)
 		{
 			return DataType;
 		}
+
 		protected virtual string MakeKnownDataType(string DataType)
 		{
 			return DataType;
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FSharpCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FSharpCodeDataFormat.cs
index b25616ad..fe07ae21 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FSharpCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FSharpCodeDataFormat.cs
@@ -26,7 +26,7 @@ namespace UniversalEditor.DataFormats.SourceCode
             return _dfr;
         }
 
-        protected override string MakeFriendlyDataType(string DataType)
+        protected override string MakeFriendlyDataTypeInternal(string DataType)
         {
             switch (DataType)
             {
@@ -86,6 +86,10 @@ namespace UniversalEditor.DataFormats.SourceCode
                 {
                     return "ulong";
                 }
+                case "System.Void":
+                {
+                    return "void";
+                }
             }
             return base.MakeFriendlyDataType(DataType);
         }
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaCodeDataFormat.cs
index 16d48179..3968fae6 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaCodeDataFormat.cs
@@ -364,7 +364,7 @@ namespace UniversalEditor.DataFormats.SourceCode.Java
         {
             base.ProcessToken(token, tr);
         }
-        protected override string MakeFriendlyDataType(string DataType)
+        protected override string MakeFriendlyDataTypeInternal(string DataType)
         {
             switch (DataType)
             {
@@ -376,7 +376,8 @@ namespace UniversalEditor.DataFormats.SourceCode.Java
                 case "System.Int32": return "int";
                 case "System.Int64": return "long";
                 case "System.Single": return "float";
-                case "System.String": return "string";
+				case "System.String": return "string";
+				case "System.Void": return "void";
             }
             return base.MakeFriendlyDataType(DataType);
         }
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/VisualBasicNETCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/VisualBasicNETCodeDataFormat.cs
index 1f600be7..bf1a290b 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/VisualBasicNETCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/VisualBasicNETCodeDataFormat.cs
@@ -699,7 +699,7 @@ namespace UniversalEditor.DataFormats.SourceCode
 			}
 		}
 
-		protected override string MakeFriendlyDataType(string DataType)
+		protected override string MakeFriendlyDataTypeInternal(string DataType)
 		{
 			switch (DataType)
 			{