These null checks should not be needed.