diff --git a/web/Gemfile b/web/Gemfile
index a32b01eae..ddc1cf308 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -25,7 +25,7 @@ gem 'responders', '~> 2.0'
 gem 'sprockets', '3.2.0'
 gem 'sprockets-es6', require: 'sprockets/es6'
 gem 'sprockets-rails', '2.3.2'
-
+gem 'non-stupid-digest-assets'
 #gem 'license_finder'
 gem 'pg_migrate', '0.1.14'
 gem 'kickbox'
diff --git a/web/app/helpers/music_session_helper.rb b/web/app/helpers/music_session_helper.rb
index 26d00b9b0..8eb7119fa 100644
--- a/web/app/helpers/music_session_helper.rb
+++ b/web/app/helpers/music_session_helper.rb
@@ -82,7 +82,10 @@ module MusicSessionHelper
     options = ""
     ActiveSupport::TimeZone::MAPPING.each do |display, name|
       tz =  ActiveSupport::TimeZone[name]
-      options << "<option value='#{display},#{tz.tzinfo.name}' class='label' data-tz='#{tz.tzinfo.name}' data-utc-offset='#{tz.utc_offset}'>#{tz.to_s}</option>"
+      if tz
+        options << "<option value='#{display},#{tz.tzinfo.name}' class='label' data-tz='#{tz.tzinfo.name}' data-utc-offset='#{tz.utc_offset}'>#{tz.to_s}</option>"
+      end
+      
     end
     options.html_safe
   end