don't we need the null check as before ?