Merge remote branch 'gitorious/master'

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/ping.php b/lib/ping.php
index be2933ae3..abf1c4048 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -27,7 +27,14 @@ function ping_broadcast_notice($notice) {
 
 	# Array of servers, URL => type
 	$notify = common_config('ping', 'notify');
-	$profile = $notice->getProfile();
+    try {
+        $profile = $notice->getProfile();
+    } catch (Exception $e) {
+        // @todo: distinguish the 'broken notice/profile' case from more general
+        //        transitory errors.
+        common_log(LOG_ERR, "Exception getting notice profile: " . $e->getMessage());
+        return true;
+    }
 	$tags = ping_notice_tags($notice);
 
 	foreach ($notify as $notify_url => $type) {