Fix stuff being done with nil fields