diff --git a/lib/contacts/aol.rb b/lib/contacts/aol.rb
index c7df1d1..aa0136b 100644
--- a/lib/contacts/aol.rb
+++ b/lib/contacts/aol.rb
@@ -131,6 +131,10 @@ def contacts
           data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
         end
         
+        if data.include?("error.gif")
+          raise AuthenticationError, "Account invalid"
+        end
+        
         parse data
       end
     end
@@ -140,7 +144,7 @@ def parse(data, options={})
       data = CSV::Reader.parse(data)
       col_names = data.shift
       @contacts = data.map do |person|
-        ["#{person[0]} #{person[1]}", person[4]] unless person[4].empty?
+        ["#{person[0]} #{person[1]}", person[4]] if person[4] && !person[4].empty?
       end.compact
     end    
   end