Merge branch 'master' of github.com:cantino/huginn

app/concerns/twitter_concern.rb

@@ -28,11 +28,11 @@ module TwitterConcern
   end
 
   def twitter_oauth_token
-    service.token
+    service && service.token
   end
 
   def twitter_oauth_token_secret
-    service.secret
+    service && service.secret
   end
 
   def twitter
@@ -49,4 +49,4 @@ module TwitterConcern
       "## Include the `twitter`, `omniauth-twitter`, and `cantino-twitter-stream` gems in your Gemfile to use Twitter Agents."
     end
   end
-end
+end