fixed things that can be null