--- a/khronosfws/openmax_al/src/engine/xaengineitf.c	Thu Aug 12 20:27:32 2010 -0500
+++ b/khronosfws/openmax_al/src/engine/xaengineitf.c	Tue Aug 24 03:16:41 2010 -0500
@@ -47,8 +47,8 @@
         const XAInterfaceID *pInterfaceIds,
         const XAboolean *pInterfaceRequired)
     {
+#ifdef OMAX_CAMERABIN
     XAEngineItfImpl* impl = GetImpl(self);
-#ifdef OMAX_CAMERABIN
     return XACameraDeviceImpl_CreateCameraDevice( impl->mapper,impl->capabilities,
             pDevice, deviceID,numInterfaces,
             pInterfaceIds, pInterfaceRequired );
@@ -423,9 +423,9 @@
 void XAEngineItfImpl_Free(XAEngineItfImpl* self)
     {
     DEBUG_API("->XAEngineItfImpl_Free");
-    assert(self==self->self);
     if(self)
         {
+        assert(self==self->self);
         free(self);
         }
     DEBUG_API("<-XAEngineItfImpl_Free");