From a4bc45528a1ca182cebef8c0d07c28da490b62c7 Mon Sep 17 00:00:00 2001
From: sebastiaan <unknown@kiln.example.com>
Date: Thu, 30 Aug 2012 08:38:49 -0200
Subject: [PATCH] Fixes U4-514 - MediaType.GetByAlias throws if alias isn't
 found

---
 src/umbraco.cms/businesslogic/media/MediaType.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/media/MediaType.cs b/src/umbraco.cms/businesslogic/media/MediaType.cs
index 6a6452bef7..18365af868 100644
--- a/src/umbraco.cms/businesslogic/media/MediaType.cs
+++ b/src/umbraco.cms/businesslogic/media/MediaType.cs
@@ -48,10 +48,15 @@ namespace umbraco.cms.businesslogic.media
         /// <returns>The MediaType with the alias</returns>
         public static new MediaType GetByAlias(string Alias)
         {
-            return new MediaType(
-                            SqlHelper.ExecuteScalar<int>(@"SELECT nodeid from cmsContentType INNER JOIN umbracoNode on cmsContentType.nodeId = umbracoNode.id WHERE nodeObjectType=@nodeObjectType AND alias=@alias",
-                                SqlHelper.CreateParameter("@nodeObjectType", MediaType._objectType),
-                                SqlHelper.CreateParameter("@alias", Alias)));
+            using (IRecordsReader dr = SqlHelper.ExecuteReader(@"SELECT nodeid from cmsContentType INNER JOIN umbracoNode on cmsContentType.nodeId = umbracoNode.id WHERE nodeObjectType=@nodeObjectType AND alias=@alias",
+                               SqlHelper.CreateParameter("@nodeObjectType", MediaType._objectType),
+                               SqlHelper.CreateParameter("@alias", Alias)))
+            {
+                if(dr.Read())
+                    return new MediaType(dr.GetInt("nodeid"));
+                else
+                    return null;
+            }
         }
 
         /// <summary>