Merge branch '0.9.x' into 1.0.x

Conflicts:
	actions/confirmaddress.php
	actions/imsettings.php

1 files changed, 4 insertions, 1 deletions

diff --git a/classes/User.php b/classes/User.php
index bec05f8cf..4626a7ca1 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -543,7 +543,10 @@ class User extends Memcached_DataObject
             return false;
         }
 
-        Subscription::cancel($other, $this->getProfile());
+        $self = $this->getProfile();
+        if (Subscription::exists($other, $self)) {
+            Subscription::cancel($other, $self);
+        }
 
         $block->query('COMMIT');