Readded null check.