Fix production error - "NoMethodError: undefined method `name' for nil:NilClass"