prevent null-events to break job, fix refactor mistake