This should fix some crashes as reported by the users.

(cherry picked from commit 984aadb5ca4f9a8bf01dffae42440320a1ea0f13)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>