Corrected null map issue