Prevent server crashing on reorg