--- station.module	2009-05-25 10:39:19.000000000 -0700
+++ station.module	2009-05-25 10:48:20.000000000 -0700
@@ -219,8 +219,10 @@ function station_get_program_at($timesta
 
   // Use the local schedule if one is available.
   if (module_exists('station_schedule')) {
-    if ($program = station_schedule_program_get_at($timestamp, $schedule_nid) && !empty($program->nid)) {
-      return $program;
+    if ($program = station_schedule_program_get_at($timestamp, $schedule_nid)) {
+      if (!empty($program->nid)) {
+        return $program;
+      } 
     }
   }
   else {
@@ -319,10 +321,13 @@ function theme_station_block_current_pro
  *   Schedule's streams.
  */
 function theme_station_streams($streams) {
+  if (!is_array($streams)) {
+    $streams = unserialize($streams);
+  }
   if (is_array($streams) && count($streams)) {
     $items = array();
     foreach ($streams as $key => $stream) {
-      $items[] = l($stream['name'], $stream['m3u_url'], array('title' => $stream['description']));
+      $items[] = l($stream['name'], $stream['urls']['0'], array('title' => $stream['description']));
     }
     return t('Tune in: ') . station_ored_list($items);
   }