readded null checker