--- service_links.module	2010-11-25 13:00:20.000000000 +0100
+++ service_links.module	2010-12-05 11:42:34.149944000 +0100
@@ -10,6 +10,7 @@
  * A module that adds Digg, del.icio.us, reddit, Technorati etc. links to nodes.
  */

+define('SERVICE_LINKS_STYLE_NONE', 0);
 define('SERVICE_LINKS_STYLE_TEXT', 1);
 define('SERVICE_LINKS_STYLE_IMAGE', 2);
 define('SERVICE_LINKS_STYLE_IMAGE_AND_TEXT', 3);
@@ -550,8 +551,8 @@
       $title = isset($node->title) ? $node->title : '';
     }
     $url = url("node/$node->nid", array('absolute' => TRUE, 'query' => $settings['text_to_append']));
-    $query = check_plain(arg(0)) . str_replace(url(arg(0)), '', url("node/$node->nid"));
-    $teaser = strip_tags($node->teaser);
+    $query = preg_replace('/^\//', '', str_replace(preg_replace('/\/\/|(\?q\=)\/+/', '\1', url('/')), '', url("node/$node->nid")));
+    $teaser = empty($node->teaser) ? '' : strip_tags($node->teaser);
     $nid = $node->nid;
   }
   else {
