diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html
index 5b36ded..06129b5 100644
--- a/ram/portal/templates/page.html
+++ b/ram/portal/templates/page.html
@@ -182,7 +182,7 @@
                       </tr>
                       <tr>
                         <th scope="row">Manufacturer</th>
-                        <td>{{ rolling_stock.rolling_class.manufacturer }}</td>
+                        <td>{{ rolling_stock.rolling_class.manufacturer|default_if_none:"" }}</td>
                       </tr>
                     </tbody>
                   </table>
@@ -222,7 +222,7 @@
                       </tr>
                       <tr>
                         <th scope="row">Manufacturer</th>
-                        <td>{{ rolling_stock.decoder.manufacturer }}</td>
+                        <td>{{ rolling_stock.decoder.manufacturer|default_if_none:"" }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Version</th>