X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bd8c0c0122a521030e867ec52aee69a48b8ab463..b332b11ee2f3fd450493b55507324c74d96b20e8:/ServiceReference.py

diff --git a/ServiceReference.py b/ServiceReference.py
index 238e7f6c..787c5c4a 100644
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -5,8 +5,8 @@ import NavigationInstance
 
 class ServiceReference(eServiceReference):
 	def __init__(self, ref):
-		if isinstance(ref, str):
-			self.ref = eServiceReference(ref)
+		if not isinstance(ref, eServiceReference):
+			self.ref = eServiceReference(ref or "")
 		else:
 			self.ref = ref
 		self.serviceHandler = eServiceCenter.getInstance()
@@ -16,10 +16,7 @@ class ServiceReference(eServiceReference):
 	
 	def getServiceName(self):
 		info = self.info()
-		if info is None:
-			return None
-		
-		return info.getName(self.ref)
+		return info and info.getName(self.ref) or ""
 
 	def play(self):
 		return self.serviceHandler.info(self.ref)