diff --git a/umbraco/cms/businesslogic/skinning/tasks/ModifyPageProperty.cs b/umbraco/cms/businesslogic/skinning/tasks/ModifyPageProperty.cs
index 3e47eaff19..933715c4ad 100644
--- a/umbraco/cms/businesslogic/skinning/tasks/ModifyPageProperty.cs
+++ b/umbraco/cms/businesslogic/skinning/tasks/ModifyPageProperty.cs
@@ -23,19 +23,25 @@ namespace umbraco.cms.businesslogic.skinning.tasks
         {
             TaskExecutionDetails d = new TaskExecutionDetails();
 
-            string id = HttpContext.Current.Items["pageID"].ToString();
-
-            Document doc = new Document(Convert.ToInt32(id));
-
-            if (doc.getProperty(PropertyAlias) != null)
+            if (HttpContext.Current != null && HttpContext.Current.Items["pageID"] != null)
             {
-                d.OriginalValue = doc.getProperty(PropertyAlias).Value.ToString();
+                string id = HttpContext.Current.Items["pageID"].ToString();
 
-                doc.getProperty(PropertyAlias).Value = Value;
-                doc.Publish(new BusinessLogic.User(0));
+                Document doc = new Document(Convert.ToInt32(id));
+
+                if (doc.getProperty(PropertyAlias) != null)
+                {
+                    d.OriginalValue = doc.getProperty(PropertyAlias).Value.ToString();
+
+                    doc.getProperty(PropertyAlias).Value = Value;
+                    doc.Publish(new BusinessLogic.User(0));
+
+                    d.NewValue = Value;
+                    d.TaskExecutionStatus = TaskExecutionStatus.Completed;
+                }
+                else
+                    d.TaskExecutionStatus = TaskExecutionStatus.Cancelled;
 
-                d.NewValue = Value;
-                d.TaskExecutionStatus = TaskExecutionStatus.Completed;
             }
             else
                 d.TaskExecutionStatus = TaskExecutionStatus.Cancelled;
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
index c9e4d510d4..d6f7ed92bc 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx
@@ -3,7 +3,7 @@
 
 <asp:Panel id="pl_CustomizeSkin" runat="server" Visible="false">
 <h3>Starter kit and skin have been installed</h3>
-<p><a target="_blank" href="<%= umbraco.GlobalSettings.Path %>/canvas.aspx?redir=<%= this.ResolveUrl("~/")  %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank">Browse and customize your new site</a></p>
+<p id="customizelink"><a target="_blank" href="<%= umbraco.GlobalSettings.Path %>/canvas.aspx?redir=<%= this.ResolveUrl("~/")  %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank">Browse and customize your new site</a></p>
 
 
 </asp:Panel>
diff --git a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
index 8ad03e1129..b997e9a79b 100644
--- a/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
+++ b/umbraco/presentation/install/steps/Skinning/loadStarterKitDesigns.ascx.cs
@@ -110,7 +110,9 @@ namespace umbraco.presentation.install.steps.Skinning
 
                 pl_CustomizeSkin.Visible = true;
                 pl_loadStarterKitDesigns.Visible = false;
-                Page.FindControl("next").Visible = true;
+
+                if(Page.FindControl("next") != null)
+                    Page.FindControl("next").Visible = true;
 
             }
             else
diff --git a/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx
index 3fcd041ba8..02c788aafa 100644
--- a/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx
+++ b/umbraco/presentation/umbraco/developer/Packages/StarterKits.aspx
@@ -20,7 +20,7 @@
     }
 </script>
 <style type="text/css">
-    .declineStarterKits 
+    .declineStarterKits, #customizelink
     {
         display:none;
     }