diff --git a/lib/onebox/engine.rb b/lib/onebox/engine.rb
index 5d64fa41f6d..9d7c6c2cfa5 100644
--- a/lib/onebox/engine.rb
+++ b/lib/onebox/engine.rb
@@ -9,7 +9,7 @@ module Onebox
     def self.engines
       constants.select do |constant|
         constant.to_s =~ /Onebox$/
-      end.map(&method(:const_get))
+      end.sort.map(&method(:const_get))
     end
 
     def self.all_iframe_origins
diff --git a/lib/onebox/engine/twitter_status_onebox.rb b/lib/onebox/engine/twitter_status_onebox.rb
index 29f22427ac8..bdb94b5ebb1 100644
--- a/lib/onebox/engine/twitter_status_onebox.rb
+++ b/lib/onebox/engine/twitter_status_onebox.rb
@@ -11,7 +11,8 @@ module Onebox
       always_https
 
       def self.===(other)
-        !Onebox.options.twitter_client.twitter_credentials_missing? && super
+        client = Onebox.options.twitter_client
+        client && !client.twitter_credentials_missing? && super
       end
 
       def http_params