diff --git a/admin.py b/admin.py
index 90694464..c662008b 100644
--- a/admin.py
+++ b/admin.py
@@ -539,6 +539,8 @@ def HandleRequest(self):
 class ResponderModerator(BaseAdminPageHandler):
   """Displays the UI for moderating responder data."""
   def EvalData(self, data):
+    if not data:
+      return {}
     try:
       evaled_data = eval(data, {})
       return evaled_data
diff --git a/contrib.py b/contrib.py
index e8369f49..fbc5dd4a 100644
--- a/contrib.py
+++ b/contrib.py
@@ -107,7 +107,8 @@ def BuildResponderList(self, responders):
 
   def GetURLOrNone(self, param):
     url = self.request.get(param)
-    if not url or not url.startswith('http://'):
+    if not url or not (url.startswith('http://') or
+                       url.startswith('https://')):
       return None
     return url
 
diff --git a/data/controller_data.py b/data/controller_data.py
index 0dc143d2..d6bbb225 100644
--- a/data/controller_data.py
+++ b/data/controller_data.py
@@ -119,7 +119,7 @@
   ],
   0x454E: [
     {'name': 'DMX USB Pro',
-     'link': 'https://www.enttec.co.uk/product/protocols/dmx512/2-universe-usb-computer-interface-dmx/',
+     'link': 'https://www.enttec.com/product/dmx-usb-interfaces/dmx-usb-pro-professional-1u-usb-to-dmx512-converter/',
      'image_url': 'http://www.enttec.com/img/dmxusbpro/flip.gif',
      'tags': ['tool', 'RDM Responder Tests', 'USB']},
     {'name': 'RDM USB Pro',
diff --git a/data/manufacturer_links.py b/data/manufacturer_links.py
index 90ea831d..97fef38e 100644
--- a/data/manufacturer_links.py
+++ b/data/manufacturer_links.py
@@ -64,6 +64,7 @@
   (0x07EA, "http://www.lemaitreltd.com/"),
   (0x0808, "http://zero88.com/"),
   (0x0854, "https://www.nec-display-solutions.com/"),
+  (0x088E, "https://www.stage1.com.tw/"),
   (0x0896, "https://www.csdcnc.com/"),
   (0x089C, "https://swit.cc/"),
   (0x089D, "http://www.gobo.ws/"),
@@ -111,6 +112,7 @@
   (0x3B10, "https://www.nxp.com/"),
   (0x4144, "https://www.adbstagelight.com/"),
   (0x414C, "https://www.artisticlicence.com/"),
+  (0x4151, "http://aquariitech.com/"),
   (0x4179, "https://www.ayrton.eu/"),
   (0x434D, "http://www.coemar.com/"),
   (0x4350, "https://www.claypaky.it/"),
@@ -122,6 +124,7 @@
   (0x4744, "http://www.goddarddesign.com/"),
   (0x4801, "http://www.capture.se/"),
   (0x4845, "http://www.helluk.com/"),
+  (0x4947, "https://www.iguzzini.com/"),
   (0x4953, "https://www.istl.com/"),
   (0x4A54, "http://jthomaseng.com/"),
   (0x4A61, "https://www.jands.com.au/"),
diff --git a/templates/display_model.tmpl b/templates/display_model.tmpl
index 3aef2c9f..0e173c09 100644
--- a/templates/display_model.tmpl
+++ b/templates/display_model.tmpl
@@ -1,6 +1,6 @@
 {% extends "base.tmpl" %}
 
-{% block title %}{{ manufacturer }} - {{ description }}{% endblock %}
+{% block title %}{{ manufacturer }} - {% if description %}{{ description }}{% else %}Model ID {{ model_id }}{% endif %}{% endblock %}
 
 {% block content %}
     <div id="fb-root"></div>