Marco Maggi @hartwork
fixed warning about potential null pointer dereference
775cfba