Fixed client-side crashing errors.