diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index 69db21022..94dde4b8f 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -29,20 +29,18 @@ namespace Orchard.CodeGeneration.Commands {
         private static readonly string _orchardWebProj = HostingEnvironment.MapPath("~/Orchard.Web.csproj");
         private static readonly string _orchardThemesProj = HostingEnvironment.MapPath("~/Themes/Themes.csproj");
 
-        private bool includeInSolution = true;
-
         public CodeGenerationCommands(
             IExtensionManager extensionManager,
             ISchemaCommandGenerator schemaCommandGenerator) {
             _extensionManager = extensionManager;
             _schemaCommandGenerator = schemaCommandGenerator;
+
+            // Default is to include in the solution when generating modules / themes
+            IncludeInSolution = true;
         }
 
         [OrchardSwitch]
-        public bool IncludeInSolution {
-            get { return includeInSolution; }
-            set { includeInSolution = value; }
-        }
+        public bool IncludeInSolution { get; set; }
 
         [OrchardSwitch]
         public bool CreateProject { get; set; }
@@ -353,9 +351,6 @@ namespace Orchard.CodeGeneration.Commands {
                     File.WriteAllText(solutionPath, solutionText);
                     TouchSolution(output);
                 }
-                else {
-                    output.WriteLine(T("Warning: Solution file could not be found at {0}", solutionPath));
-                }
             }
         }