Quick change to better catch serialization errors.