From bc0da04470a76a6a6dacad311de98fb63d0f0af1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 4 Nov 2013 18:27:08 +1100
Subject: [PATCH] Fixes another issue with the installer and detecting macros

---
 src/umbraco.cms/businesslogic/Packager/Installer.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index 01dc2522bf..fd121025b9 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -622,13 +622,12 @@ namespace umbraco.cms.businesslogic.packager
                 var alias = n.SelectSingleNode("alias").InnerText;
                 if (!string.IsNullOrEmpty(alias))
                 {
-                    try
+                    var m = ApplicationContext.Current.Services.MacroService.GetByAlias(alias);
+                    if (m != null)
                     {
-                        var m = new Macro(alias);
-                        this.ContainsMacroConflict = true;
-                        this._conflictingMacroAliases.Add(m.Name, alias);
-                    }
-                    catch (IndexOutOfRangeException) { } //thrown when the alias doesn't exist in the DB, ie - macro not there
+                        ContainsMacroConflict = true;
+                        _conflictingMacroAliases.Add(m.Name, alias);
+                    }                    
                 }
             }