diff --git a/samples/MvcSample.Web/Views/Home/Create.cshtml b/samples/MvcSample.Web/Views/Home/Create.cshtml
index be2667807b..3acb6693d7 100644
--- a/samples/MvcSample.Web/Views/Home/Create.cshtml
+++ b/samples/MvcSample.Web/Views/Home/Create.cshtml
@@ -26,7 +26,7 @@
         if (metadata != null)
         {
             var typeName = metadata.ModelType.Name;
-            var description = metadata.Description;
+            var description = metadata.Description ?? "no description";
             <p>@typeName has description '@description' and contains</p>
             <ul>
                 @foreach (var property in metadata.Properties)
diff --git a/samples/MvcSample.Web/Views/Home/Test.cshtml b/samples/MvcSample.Web/Views/Home/Test.cshtml
deleted file mode 100644
index 4f466c7c3f..0000000000
--- a/samples/MvcSample.Web/Views/Home/Test.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-Hello From Razor
\ No newline at end of file
diff --git a/samples/MvcSample.Web/Views/Shared/HelloWorldPartial.cshtml b/samples/MvcSample.Web/Views/Shared/HelloWorldPartial.cshtml
index b3caac0643..4c2bac4876 100644
--- a/samples/MvcSample.Web/Views/Shared/HelloWorldPartial.cshtml
+++ b/samples/MvcSample.Web/Views/Shared/HelloWorldPartial.cshtml
@@ -1,6 +1,6 @@
 @using MvcSample.Web.Models
 @model User
 
-<strong>Hello @Model.Name from Partial</strong>
+<strong>Hello @(Model?.Name) from Partial</strong>
 
 <a href="@Url.Action("Create", "Home")">Create Something!</a>
\ No newline at end of file
diff --git a/samples/MvcSample.Web/Views/Shared/MyView.cshtml b/samples/MvcSample.Web/Views/Shared/MyView.cshtml
index 8fbe48d3f6..2a6574693d 100644
--- a/samples/MvcSample.Web/Views/Shared/MyView.cshtml
+++ b/samples/MvcSample.Web/Views/Shared/MyView.cshtml
@@ -53,7 +53,7 @@
     <p><a href="http://asp.net" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
 </div>
 <div class="row">
-    <h3 title="@Model.Name" class="@nullValue">Hello @Html.DisplayTextFor(User => User)! Happy @Model.Age birthday.</h3>
+    <h3 title="@(Model?.Name)" class="@nullValue">Hello @Html.DisplayTextFor(User => User)! Happy @(Model?.Age) birthday.</h3>
     <h3 id="qux">This value was retrieved asynchronously: @(await AsyncValueRetrieval())</h3>
     <h3>Partial Async: @await Html.PartialAsync("HelloWorldPartial", Model)</h3>
     <h3>