diff --git a/spotipy/__init__.py b/spotipy/__init__.py
index beb039e..5969c70 100644
--- a/spotipy/__init__.py
+++ b/spotipy/__init__.py
@@ -206,6 +206,8 @@ class Spotify(object):
     def user_playlist(self, user, playlist_id, fields=None):
         ''' Gets playlist of a user
         '''
+        if playlist_id == None:
+            return self.get("users/%s/starred" % (user), fields=fields)
         return self.get("users/%s/playlists/%s" % (user, playlist_id), fields=fields)
 
     def user_playlist_create(self, user, name, public=True):