Further null pointer fix