New nullable annotation
Fixed missing null check