1 files changed, 10 insertions, 4 deletions
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index cf75a73..5a9d28c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,26 +22,32 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(10)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
     end
   rescue Twitter::Error::BadRequest
     error_handling
-    twitter_user_info[3] = "The request to display tweets is invalid or cannot be otherwise served."
+    twitter_user_info[3] = "The request for displaying tweets is invalid or cannot be otherwise served."
   rescue Twitter::Error::Unauthorized
     error_handling
     twitter_user_info[3] = "The account's tweets are protected and cannot be displayed. Please change the privacy settings of the corresponding account."
   rescue Twitter::Error::Forbidden
     error_handling
-    twitter_user_info[3] = "The request to display tweets is understood, but it has been refused or access is not allowed."
+    twitter_user_info[3] = "The request for displaying tweets is understood, but it has been refused or access is not allowed."
   rescue Twitter::Error::NotAcceptable
     error_handling
-    twitter_user_info[3] = "An invalid format is specified in the request to display tweets."
+    twitter_user_info[3] = "An invalid format is specified in the request for displaying tweets."
   rescue Twitter::Error::TooManyRequests
     error_handling
     twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to display tweets in a couple of minutes."
+  rescue Twitter::Error::NotFound
+    error_handling
+    twitter_user_info[3] = "The twitter hanlde does not exist."
+  rescue Twitter::Error
+    error_handling
+    twitter_user_info[3] = "An error occured while fetching the tweets."
   end
 
   def error_handling