diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
index 4abc1c8731..3ead9903c4 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
@@ -59,11 +59,16 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
                     MasterTemplate.Items.Add(li);
 				}
 
-                if (_template.MasterTemplate > 0)
-                    MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
+                try
+                {
+                    if (_template.MasterTemplate > 0)
+                        MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
+                }
+                catch (Exception ex)
+                {
+                }
 
-
-				MasterTemplate.SelectedValue = selectedTemplate;
+			    MasterTemplate.SelectedValue = selectedTemplate;
 
 				NameTxt.Text = _template.GetRawText();
 				AliasTxt.Text = _template.Alias;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index 73852de242..026cb7d137 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -59,8 +59,14 @@ namespace umbraco.cms.presentation.settings
                 AliasTxt.Text = _template.Alias;
                 editorSource.Text = _template.Design;
 
-                if(_template.MasterTemplate > 0)
-                    MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
+                try
+                {
+                    if (_template.MasterTemplate > 0)
+                        MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
+                }
+                catch (Exception ex)
+                {
+                }
 
                 ClientTools
                     .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadTemplates>().Tree.Alias)