diff --git a/lib/oneboxer/stack_exchange_onebox.rb b/lib/oneboxer/stack_exchange_onebox.rb
index 028bc717006..07e60cecad6 100644
--- a/lib/oneboxer/stack_exchange_onebox.rb
+++ b/lib/oneboxer/stack_exchange_onebox.rb
@@ -35,10 +35,12 @@ module Oneboxer
     def parse(data)
       result = JSON.parse(data)['items'].first
 
-      result['creation_date'] =
-        Time.at(result['creation_date'].to_i).strftime("%I:%M%p - %d %b %y")
+      if result
+        result['creation_date'] =
+          Time.at(result['creation_date'].to_i).strftime("%I:%M%p - %d %b %y")
 
-      result['tags'] = result['tags'].take(4).join(', ')
+        result['tags'] = result['tags'].take(4).join(', ')
+      end
 
       result
     end
diff --git a/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js b/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
index 296d649356d..0924cb15d0e 100644
--- a/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
+++ b/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
@@ -47,7 +47,7 @@
             });
           }
 
-          var options = []
+          var options = [];
           var i;
           for (i=0; i < emoji.length; i++) {
             if (emoji[i].indexOf(term) === 0) {