diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs
index 60cc80328b..84f1df5061 100644
--- a/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -650,7 +650,10 @@ namespace Prebuild.Core.Targets
 
 		private void WriteSolutionFiles(SolutionNode solution, StreamWriter ss)
 		{
-			WriteProject(ss, "Folder", solution.Guid, "Solution Files", "Solution Files", solution.Files);
+            if (solution.Files != null && solution.Files.Count > 0)
+            {
+                WriteProject(ss, "Folder", solution.Guid, "Solution Files", "Solution Files", solution.Files);
+            }
 		}
 
 		private void WriteEmbeddedSolution(StreamWriter writer, SolutionNode embeddedSolution)
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 51c62136be..39d8af8934 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ