Fixes a null pointer dereference.
Fixes 2nd half of Ticket800
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>