Fix a MAJOR client crashing problem.