Merge branch '0.9.x'

1 files changed, 6 insertions, 0 deletions

diff --git a/plugins/Facebook/facebookremove.php b/plugins/Facebook/facebookremove.php
index b048a435f..bc76daaef 100644
--- a/plugins/Facebook/facebookremove.php
+++ b/plugins/Facebook/facebookremove.php
@@ -48,6 +48,12 @@ class FacebookremoveAction extends FacebookAction
 
             $flink = Foreign_link::getByForeignID($this->arg('fb_sig_user'), 2);
 
+            if (!$flink) {
+                common_log(LOG_ERR, "Tried to delete missing foreign_link entry with Facebook ID " . $this->arg('fb_sig_user'));
+                $this->serverError(_m('Couldn\'t remove Facebook user: already deleted.'));
+                return;
+            }
+
             common_debug("Removing foreign link to Facebook - local user ID: $flink->user_id, Facebook ID: $flink->foreign_id");
 
             $result = $flink->delete();