diff --git a/mac_installer/PostInstall.cpp b/mac_installer/PostInstall.cpp
index 696caa4ce0..0ca7dc9d5e 100644
--- a/mac_installer/PostInstall.cpp
+++ b/mac_installer/PostInstall.cpp
@@ -1207,7 +1207,10 @@ static Boolean ShowMessage(Boolean allowCancel, const char *format, ...) {
                 &responseFlags);
     
        
-    CFRelease(myString);
+    if (myIconURLRef) CFRelease(myIconURLRef);
+    if (myString) CFRelease(myString);
+    if (yes) CFRelease(yes);
+    if (no) CFRelease(no);
 
     if (retval) return false;
     return (responseFlags == kCFUserNotificationDefaultResponse);
diff --git a/mac_installer/uninstall.cpp b/mac_installer/uninstall.cpp
index 55021cac73..c23db7ec90 100644
--- a/mac_installer/uninstall.cpp
+++ b/mac_installer/uninstall.cpp
@@ -1439,8 +1439,11 @@ static Boolean ShowMessage(Boolean allowCancel, Boolean continueButton, const ch
                 continueButton? continueString : NULL, allowCancel ? cancelString : NULL, NULL,
                 &responseFlags);
     
-       
-    CFRelease(myString);
+    if (myIconURLRef) CFRelease(myIconURLRef);
+    if (myString) CFRelease(myString);
+    if (theTitle) CFRelease(theTitle);
+    if (cancelString) CFRelease(cancelString);
+    if (continueString) CFRelease(continueString);
 
     if (retval) return false;
     // Return TRUE if user clicked Continue or OK, FALSE if user clicked Cancel