From b1c67b8f22317f559390ddd1a42cce00b89614d3 Mon Sep 17 00:00:00 2001
From: Christopher York <devnull@localhost>
Date: Tue, 8 Oct 2013 10:56:18 -0500
Subject: [PATCH] Fixed: Null reference exception

---
 .../DesktopModules/WebsitePanel/SystemSettings.ascx.cs       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
index 8d07c97d..c55eeb8a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
@@ -125,10 +125,9 @@ namespace WebsitePanel.Portal
             }
      
             // FILE MANAGER
-            settings = ES.Services.System.GetSystemSettings(
-                WSP.SystemSettings.FILEMANAGER_SETTINGS);
+            settings = ES.Services.System.GetSystemSettings(WSP.SystemSettings.FILEMANAGER_SETTINGS);
 
-            if (settings != null)
+            if (settings != null && !String.IsNullOrEmpty(settings[FILE_MANAGER_EDITABLE_EXTENSIONS]))
             {
                 txtFileManagerEditableExtensions.Text = settings[FILE_MANAGER_EDITABLE_EXTENSIONS].Replace(",", System.Environment.NewLine);
             }