diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c
index 0a075886e6..3f956bed50 100644
--- a/libmpdemux/muxer.c
+++ b/libmpdemux/muxer.c
@@ -21,30 +21,47 @@
 muxer_t *muxer_new_muxer(int type,FILE *f){
     muxer_t* muxer=malloc(sizeof(muxer_t));
     memset(muxer,0,sizeof(muxer_t));
+    if(!muxer)
+        return NULL;
     muxer->file = f;
     switch (type) {
       case MUXER_TYPE_MPEG:
 	if(! muxer_init_muxer_mpeg(muxer))
-	  return NULL;
+        {
+          free(muxer);
+          return NULL;
+        }
 	break;
       case MUXER_TYPE_RAWVIDEO:
         if(! muxer_init_muxer_rawvideo(muxer))
+        {
+	  free(muxer);
 	  return NULL;
+        }
 	break;
       case MUXER_TYPE_RAWAUDIO:
         if(! muxer_init_muxer_rawaudio(muxer))
+        {
+          free(muxer);
           return NULL;
+        }
         break;
 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
       case MUXER_TYPE_LAVF:
         if(! muxer_init_muxer_lavf(muxer))
-	  return NULL;
+        {
+          free(muxer);
+          return NULL;
+        }
         break;
 #endif
       case MUXER_TYPE_AVI:
       default:
 	if(! muxer_init_muxer_avi(muxer))
-	  return NULL;
+        {
+          free(muxer);
+          return NULL;
+        }
     }
     return muxer;
 }