diff --git a/src/sound.py b/src/sound.py
index 32f76e23..7ae5cabb 100644
--- a/src/sound.py
+++ b/src/sound.py
@@ -104,14 +104,13 @@ class URLStream(object):
   log.debug("Preparing URL: %s" % (url,))
   self.prepared = False
   self.url = url_shortener.unshorten(url)
+  if self.url == None:
+   self.url = url
   log.debug("Expanded URL: %s" % (self.url,))
   if self.url != None:
    transformer = audio_services.find_url_transformer(self.url)
-   self.url = transformer(self.url)
-   log.debug("Transformed URL: %s. Prepared" % (self.url,))
-  else:
-   self.url = url
-   log.debug("Transformed URL: %s. Prepared" % (self.url,))
+  self.url = transformer(self.url)
+  log.debug("Transformed URL: %s. Prepared" % (self.url,))
   self.prepared = True
 
  def seek(self,step):
diff --git a/src/twitter/compose.py b/src/twitter/compose.py
index 595ebfa8..c31a8da7 100644
--- a/src/twitter/compose.py
+++ b/src/twitter/compose.py
@@ -109,7 +109,6 @@ def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False):
  if quoted_tweet.has_key("retweeted_status"):
   if quoted_tweet["retweeted_status"].has_key("full_text"):
    value = "full_text"
-   log.error(quoted_tweet["retweeted_status"]["full_text"])
   else:
    value = "text"
   text = StripChars(quoted_tweet["retweeted_status"][value])