diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWritingScope.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWritingScope.cs
index e682454fda..38d140e05c 100644
--- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWritingScope.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWritingScope.cs
@@ -57,7 +57,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler
 
         private void TryAutoSpace(string spaceCharacter)
         {
-            if (_autoSpace && !Char.IsWhiteSpace(_writer.LastWrite.Last()))
+            if (_autoSpace && _writer.LastWrite.Length > 0 && !Char.IsWhiteSpace(_writer.LastWrite.Last()))
             {
                 _writer.Write(spaceCharacter);
             }
diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs
index 6190347bec..891cbd5a73 100644
--- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs
@@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
                 documentLocation: _documentMapping,
                 generatedLocation: new MappingLocation(_generatedLocation, _generatedContentLength));
 
-            if (_writer.LastWrite.Last() != '\n')
+            if (_writer.ToString().Last() != '\n')
             {
                 _writer.WriteLine();
             }