diff --git a/plugins/OStatus/js/ostatus.js b/plugins/OStatus/js/ostatus.js
index 148a05f6f6..1fc44b21b6 100644
--- a/plugins/OStatus/js/ostatus.js
+++ b/plugins/OStatus/js/ostatus.js
@@ -63,11 +63,10 @@ SN.U.DialogBox = {
             f.show();
         }
         else {
-            a[0].href = (a[0].href.match(/[\\?]/) === null) ? a[0].href+'?' : a[0].href+'&';
             $.ajax({
                 type: 'GET',
                 dataType: 'xml',
-                url: a[0].href+'ajax=1',
+                url: a[0].href + ((a[0].href.match(/[\\?]/) === null)?'?':'&') + 'ajax=1',
                 beforeSend: function(formData) {
                     a.addClass('processing');
                 },
diff --git a/plugins/OStatus/lib/magicsig.php b/plugins/OStatus/lib/magicsig.php
index af65bad046..50eb301ab3 100644
--- a/plugins/OStatus/lib/magicsig.php
+++ b/plugins/OStatus/lib/magicsig.php
@@ -57,8 +57,10 @@ class MagicsigRsaSha256
         $keypair = new Crypt_RSA_KeyPair($key_length);
         $params['public_key'] = $keypair->getPublicKey();
         $params['private_key'] = $keypair->getPrivateKey();
-        
+
+        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
         $this->keypair = new Crypt_RSA($params);
+        PEAR::popErrorHandling();
     }
 
 
@@ -79,6 +81,8 @@ class MagicsigRsaSha256
     
     public function fromString($text)
     {
+        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
+
         // remove whitespace
         $text = preg_replace('/\s+/', '', $text);
 
@@ -86,7 +90,6 @@ class MagicsigRsaSha256
         if (!preg_match('/RSA\.([^\.]+)\.([^\.]+)(.([^\.]+))?/', $text, $matches)) {
             return false;
         }
-
         
         $mod = base64_url_decode($matches[1]);
         $exp = base64_url_decode($matches[2]);
@@ -110,6 +113,7 @@ class MagicsigRsaSha256
         }
 
         $this->keypair = new Crypt_RSA($params);
+        PEAR::popErrorHandling();
     }
 
     public function getName()