diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 07396e261..e508ea134 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -807,7 +807,9 @@ int CStreamInfo2::ts_setup ()
 	if(vpid == 0 && apid == 0)
 		return -1;
 
-	dmx = new cDemux(0);//FIXME test
+	dmx = new cDemux(0);
+	if(!dmx)
+		return -1;
 
 	dmx->Open(DMX_TP_CHANNEL, NULL, 3 * 3008 * 62);