diff --git a/admin/Gemfile b/admin/Gemfile
index 923e75852..c67712122 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -40,10 +40,10 @@ gem 'jquery-rails', '2.3.0' # pinned because jquery-ui-rails was split from jque
 gem 'rails3-jquery-autocomplete'
 gem 'activeadmin', '0.6.2'
 gem 'mime-types', '1.25'
-gem "meta_search" #, '>= 1.1.0.pre'
+gem 'meta_search'
 gem 'fog',  "~> 1.18.0"
 gem 'unf', '0.1.3' #optional fog dependency
-gem 'country-select', '1.1.1'
+gem 'country-select'
 gem 'aasm', '3.0.16'
 gem 'postgres-copy', '0.6.0'
 gem 'aws-sdk'
diff --git a/web/app/assets/javascripts/findSession.js b/web/app/assets/javascripts/findSession.js
index 832f298e6..bc063cc73 100644
--- a/web/app/assets/javascripts/findSession.js
+++ b/web/app/assets/javascripts/findSession.js
@@ -152,13 +152,15 @@
         function containsInvitation(session) {
             var i, invitation = null;
 
-            if ("invitations" in session) {
-                // user has invitations for this session
-                for (i=0; i < session.invitations.length; i++) {
-                    invitation = session.invitations[i];
-                    // session contains an invitation for this user
-                    if (invitation.receiver_id == context.JK.currentUserId) {
-                        return true;
+            if (session !== undefined) {
+                if ("invitations" in session) {
+                    // user has invitations for this session
+                    for (i=0; i < session.invitations.length; i++) {
+                        invitation = session.invitations[i];
+                        // session contains an invitation for this user
+                        if (invitation.receiver_id == context.JK.currentUserId) {
+                            return true;
+                        }
                     }
                 }
             }
@@ -169,12 +171,14 @@
         function containsFriend(session) {
             var i, participant = null;
 
-            if ("participants" in session) {
-                for (i=0; i < session.participants.length; i++) {
-                    participant = session.participants[i];
-                    // this session participant is a friend
-                    if (participant !== null && participant !== undefined && participant.user.is_friend) {
-                        return true;
+            if (session !== undefined) {
+                if ("participants" in session) {
+                    for (i=0; i < session.participants.length; i++) {
+                        participant = session.participants[i];
+                        // this session participant is a friend
+                        if (participant !== null && participant !== undefined && participant.user.is_friend) {
+                            return true;
+                        }
                     }
                 }
             }