diff --git a/formula10/__init__.py b/formula10/__init__.py
index dea5be4..7a4b494 100644
--- a/formula10/__init__.py
+++ b/formula10/__init__.py
@@ -9,7 +9,7 @@ app.url_map.strict_slashes = False
 db: SQLAlchemy = SQLAlchemy()
 db.init_app(app)
 
-# NOTE: These imports are required to register the routes. They need to be after "app" is declared
+# NOTE: These imports are required to register the routes. They need to be imported after "app" is declared
 import formula10.controller.race_controller  # type: ignore
 import formula10.controller.season_controller  # type: ignore
 import formula10.controller.admin_controller  # type: ignore
diff --git a/formula10/templates/race.jinja b/formula10/templates/race.jinja
index f93bccb..740d2f6 100644
--- a/formula10/templates/race.jinja
+++ b/formula10/templates/race.jinja
@@ -52,24 +52,28 @@
                     <small><span class="fw-bold">Guess:</span> P{{ model.current_race.place_to_guess }}</small>
                 </td>
 
-                {% for user in model.all_users() %}
-                    {% set user_guess = model.race_guesses_by(user_name=user.name, race_name=model.current_race.name) %}
+                {% if model.all_users() | length > 0 %}
+                    {% for user in model.all_users() %}
+                        {% set user_guess = model.race_guesses_by(user_name=user.name, race_name=model.current_race.name) %}
 
-                    <td class="text-center text-nowrap">
-                        {% if user_guess is not none %}
-                            <ul class="list-group list-group-flush">
-                                <li class="list-group-item" style="background-color: inherit;">
-                                    {{ user_guess.pxx_guess.abbr }}
-                                </li>
-                                <li class="list-group-item" style="background-color: inherit;">
-                                    {{ user_guess.dnf_guess.abbr }}
-                                </li>
-                            </ul>
-                        {% else %}
-                            &nbsp;
-                        {% endif %}
-                    </td>
-                {% endfor %}
+                        <td class="text-center text-nowrap">
+                            {% if user_guess is not none %}
+                                <ul class="list-group list-group-flush">
+                                    <li class="list-group-item" style="background-color: inherit;">
+                                        {{ user_guess.pxx_guess.abbr }}
+                                    </li>
+                                    <li class="list-group-item" style="background-color: inherit;">
+                                        {{ user_guess.dnf_guess.abbr }}
+                                    </li>
+                                </ul>
+                            {% else %}
+                                &nbsp;
+                            {% endif %}
+                        </td>
+                    {% endfor %}
+                {% else %}
+                    <td>&nbsp;</td>
+                {% endif %}
 
                 <td>&nbsp;</td>
             </tr>
@@ -116,30 +120,34 @@
                     <small><span class="fw-bold">Guessed:</span> P{{ past_result.race.place_to_guess }}</small>
                 </td>
 
-                {% for user in model.all_users_or_active_user() %}
-                    <td class="text-center text-nowrap">
-                        {% set user_guess = model.race_guesses_by(user_name=user.name, race_name=past_result.race.name) %}
+                {% if model.all_users_or_active_user() | length > 0 %}
+                    {% for user in model.all_users_or_active_user() %}
+                        <td class="text-center text-nowrap">
+                            {% set user_guess = model.race_guesses_by(user_name=user.name, race_name=past_result.race.name) %}
 
-                        {% if user_guess is not none %}
-                            <ul class="list-group list-group-flush">
-                                <li class="list-group-item {{ pxx_guess_colorization(guessed_driver=user_guess.pxx_guess, result=past_result) }}">
+                            {% if user_guess is not none %}
+                                <ul class="list-group list-group-flush">
+                                    <li class="list-group-item {{ pxx_guess_colorization(guessed_driver=user_guess.pxx_guess, result=past_result) }}">
                                     <span data-bs-toggle="tooltip"
                                           title="{{ past_result.driver_standing_points_string(user_guess.pxx_guess) }}">
                                         {{ user_guess.pxx_guess.abbr ~ past_result.driver_standing_position_string(user_guess.pxx_guess) }}
                                     </span>
-                                </li>
-                                <li class="list-group-item {{ dnf_guess_colorization(guessed_driver=user_guess.dnf_guess, result=past_result) }}">
+                                    </li>
+                                    <li class="list-group-item {{ dnf_guess_colorization(guessed_driver=user_guess.dnf_guess, result=past_result) }}">
                                     <span data-bs-toggle="tooltip"
                                           title="{{ past_result.driver_dnf_points_string(user_guess.dnf_guess) }}">
                                         {{ user_guess.dnf_guess.abbr }}
                                     </span>
-                                </li>
-                            </ul>
-                        {% else %}
-                            &nbsp;
-                        {% endif %}
-                    </td>
-                {% endfor %}
+                                    </li>
+                                </ul>
+                            {% else %}
+                                &nbsp;
+                            {% endif %}
+                        </td>
+                    {% endfor %}
+                {% else %}
+                    <td>&nbsp;</td>
+                {% endif %}
 
                 {# Actual result #}
                 <td class="text-center text-nowrap">