This should avoid numerous crashes

(cherry picked from commit 30c05d8e241429989db1b230b0e413cf33dcb865)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>