diff --git a/server/src/uds/transports/NX/__init__.py b/server/src/uds/transports/NX/__init__.py
index 889abd81f..eedfed497 100644
--- a/server/src/uds/transports/NX/__init__.py
+++ b/server/src/uds/transports/NX/__init__.py
@@ -43,7 +43,7 @@ Config.section('NX').value('downloadUrl', 'http://sourceforge.net/projects/openn
 Config.section('NX').value('downloadUrlMACOS', 'http://opennx.net/download.html').get()
 
 
-UserPrefsManager.manager().registerPrefs('nx', _('NX Protocol'), [CommonPrefs.screenSizePref])
+UserPrefsManager.manager().registerPrefs('nx', _('NX/X2GO'), [CommonPrefs.screenSizePref])
 
 # DownloadsManager.manager().registerDownloadable('udsactor-nx_1.0_all.deb',
 #                                                _('UDS Actor connector for NX <b>(requires nomachine packages)</b>'),
diff --git a/server/src/uds/transports/X2GO/BaseX2GOTransport.py b/server/src/uds/transports/X2GO/BaseX2GOTransport.py
index 0aabd4b0e..12d7a55c8 100644
--- a/server/src/uds/transports/X2GO/BaseX2GOTransport.py
+++ b/server/src/uds/transports/X2GO/BaseX2GOTransport.py
@@ -47,7 +47,7 @@ import six
 import os
 import logging
 
-__updated__ = '2016-11-07'
+__updated__ = '2017-01-30'
 
 
 logger = logging.getLogger(__name__)
@@ -119,7 +119,7 @@ class BaseX2GOTransport(Transport):
             {'id': '4', 'text': 'LAN'},
     ], tab=gui.PARAMETERS_TAB)
 
-    soundType = gui.ChoiceField(label=_('Desktop'), order=30, tooltip=_('Desktop session'),
+    soundType = gui.ChoiceField(label=_('Sound'), order=30, tooltip=_('Sound server'),
         defvalue='pulse',
         values=[
             {'id': 'pulse', 'text': 'Pulse'},
diff --git a/server/src/uds/transports/X2GO/TX2GOTransport.py b/server/src/uds/transports/X2GO/TX2GOTransport.py
index 536b74d65..1d8ce0d4f 100644
--- a/server/src/uds/transports/X2GO/TX2GOTransport.py
+++ b/server/src/uds/transports/X2GO/TX2GOTransport.py
@@ -46,7 +46,7 @@ import logging
 import random
 import string
 
-__updated__ = '2017-01-09'
+__updated__ = '2017-01-30'
 
 logger = logging.getLogger(__name__)
 
diff --git a/server/src/uds/transports/X2GO/X2GOTransport.py b/server/src/uds/transports/X2GO/X2GOTransport.py
index f81cd89d6..6c223d06e 100644
--- a/server/src/uds/transports/X2GO/X2GOTransport.py
+++ b/server/src/uds/transports/X2GO/X2GOTransport.py
@@ -40,7 +40,7 @@ from . import x2gofile
 
 import logging
 
-__updated__ = '2017-01-09'
+__updated__ = '2017-01-30'
 
 logger = logging.getLogger(__name__)
 
diff --git a/server/src/uds/transports/X2GO/__init__.py b/server/src/uds/transports/X2GO/__init__.py
index defbf1783..586253c5c 100644
--- a/server/src/uds/transports/X2GO/__init__.py
+++ b/server/src/uds/transports/X2GO/__init__.py
@@ -38,4 +38,4 @@ from .TX2GOTransport import TX2GOTransport
 
 
 # We will use same prefs as for NX, X2GO is based on it
-UserPrefsManager.manager().registerPrefs('nx', _('NX Protocol'), [CommonPrefs.screenSizePref])
+UserPrefsManager.manager().registerPrefs('nx', _('NX/X2GO'), [CommonPrefs.screenSizePref])
diff --git a/server/src/uds/web/views/index.py b/server/src/uds/web/views/index.py
index 38aed4012..536b822fe 100644
--- a/server/src/uds/web/views/index.py
+++ b/server/src/uds/web/views/index.py
@@ -52,7 +52,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-__updated__ = '2016-11-22'
+__updated__ = '2017-02-02'
 
 
 def about(request):
@@ -150,6 +150,8 @@ def index(request):
         trans = []
         for t in svr.transports.all().order_by('priority'):
             typeTrans = t.getType()
+            if typeTrans is None:  # This may happen if we "remove" a transport type but we have a transport of that kind on DB
+                continue
             if t.validForIp(request.ip) and typeTrans.supportsOs(os['OS']) and t.validForOs(os['OS']):
                 if typeTrans.ownLink is True:
                     link = reverse('TransportOwnLink', args=('F' + svr.uuid, t.uuid))