Bugfix by Steffen Nurpmeso: Pointer not tested for being NULL
CHANGES updated