diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c
index d669b77..38ae941 100644
--- a/libeplayer3/container/container_ffmpeg.c
+++ b/libeplayer3/container/container_ffmpeg.c
@@ -1871,6 +1871,10 @@ static int Command(void  *_context, ContainerCmd_t command, void * argument)
 
     ffmpeg_printf(50, "Command %d\n", command);
 
+#ifdef MARTII
+    if (command != CONTAINER_INIT && !avContext)
+	return cERR_CONTAINER_FFMPEG_ERR;
+#endif
     switch(command)
     {
     case CONTAINER_INIT:  {