Merge fix from facelift-r9069 branch

 - Legacy-Id: 9080

Author: OleLaursen

ietf/templates/meeting/agenda.html

@@ -191,12 +191,12 @@ <h2>
 					{% endif %}
 				</td>
                                 <td class="hidden-xs" colspan="3">
-					{% if item.timeslot.show_location %}
-						<a href="//tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
+                                        {% if item.timeslot.show_location and item.timeslot.get_location %}
+                                                <a href="//tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
 					{% endif %}
 				</td>
                                 <td class="visible-xs">
-					{% if item.timeslot.show_location %}
+                                        {% if item.timeslot.show_location and item.timeslot.get_location %}
 						<a href="//tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
 					{% endif %}
 				</td>
@@ -221,12 +221,12 @@ <h2>
 							{% endif %}
 						</th>
                                                 <td class="hidden-xs" colspan="3">
-							{% if item.timeslot.show_location %}
+                                                        {% if item.timeslot.show_location and item.timeslot.get_location %}
 								<a href="//tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
 							{% endif %}
 						</td>
                                                 <td class="visible-xs">
-							{% if item.timeslot.show_location %}
+                                                        {% if item.timeslot.show_location and item.timeslot.get_location %}
 								<a href="//tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
 							{% endif %}
 						</td>
@@ -236,7 +236,7 @@ <h2>
 					</td>
 
 					<td>
-						{% if item.timeslot.show_location %}
+                                                {% if item.timeslot.show_location and item.timeslot.get_location %}
 							<a href="//tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
 						{% endif %}
 					</td>