thodg/rad

diff --git a/lib/mpdc.rb b/lib/mpdc.rb
index 997f21b..18ee08e 100644
--- a/lib/mpdc.rb
+++ b/lib/mpdc.rb
@@ -16,11 +16,11 @@ module MPDC
   end
 
   def self.current_song
-    mpd_client.currentsong rescue (connect; current_song)
+    (mpd_client.currentsong rescue (connect; current_song)) || (connect; current_song)
   end
 
   def self.mpd_version
-    mpd_client.mpd_version rescue (connect; mpd_version)
+    (mpd_client.mpd_version rescue (connect; mpd_version)) || (connect; mpd_version)
   end
 
   def self.picture(file)
@@ -34,18 +34,18 @@ module MPDC
   end
 
   def self.playlist_info
-    mpd_client.playlistinfo rescue (connect; playlist_info)
+    (mpd_client.playlistinfo rescue (connect; playlist_info)) || (connect; playlist_info)
   end
 
   def self.read_picture(file)
-    mpd_client.readpicture(file) rescue (connect; read_picture file)
+    (mpd_client.readpicture(file) rescue (connect; read_picture file)) || (connect; read_picture(file))
   end
 
   def self.stats
-    mpd_client.stats rescue (connect; stats)
+    (mpd_client.stats rescue (connect; stats)) || (connect; stats)
   end
 
   def self.status
-    mpd_client.status rescue (connect; status)
+    (mpd_client.status rescue (connect; status)) || (connect; status)
   end
 end