--- a/khronosfws/openmax_al/src/common/xastreaminformationitf.c	Thu Aug 12 20:27:32 2010 -0500
+++ b/khronosfws/openmax_al/src/common/xastreaminformationitf.c	Tue Aug 24 03:16:41 2010 -0500
@@ -316,9 +316,9 @@
 void XAStreamInformationItfImpl_Free(XAStreamInformationItfImpl* self)
     {
     DEBUG_API("->XAStreamInformationItfImpl_Free");
-    assert(self==self->self);
     if(self)
         {
+        assert(self==self->self);
         free(self);
         }
     DEBUG_API("<-XAStreamInformationItfImpl_Free");