additional fix for nullptr support