Fix to gracefully ignore null data