Minor change to prevent nullpointers.