Fixed nullable fk issue, removed accidental set_trace