Fix server crash

PULL NOW PLZ