Fix remaining null passing.