diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp
index 6a74b420..88e4bf02 100644
--- a/LEGO1/mxomni.cpp
+++ b/LEGO1/mxomni.cpp
@@ -221,13 +221,13 @@ MxResult MxOmni::Create(MxOmniCreateParam &p)
       if (m_notificationManager->Create(100, 0) != SUCCESS)
         goto done;
     }
+    else
+      goto done;
   }
 
   if (p.CreateFlags().CreateStreamer()) {
-    if (m_streamer = new MxStreamer()) {
-      if (m_streamer->Create() != SUCCESS)
-        goto done;
-    }
+    if (!(m_streamer = new MxStreamer()) || m_streamer->Create() != SUCCESS) 
+      goto done;
   }
 
   if (p.CreateFlags().CreateVideoManager()) {